diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cb7f579c0..f6c73b5c1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,18 +26,18 @@ jobs: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build ols-shared and copy to dataload and backend - run: | - cd dataload - mkdir libs - cd ../backend - mkdir libs - cd .. - cd ols-shared - mvn clean package - cp target/ols4-shared-1.0.0-SNAPSHOT.jar ../dataload/libs/ols4-shared-1.0.0-SNAPSHOT.jar - cp target/ols4-shared-1.0.0-SNAPSHOT.jar ../backend/libs/ols4-shared-1.0.0-SNAPSHOT.jar +# +# - name: Build ols-shared and copy to dataload and backend +# run: | +# cd dataload +# mkdir libs +# cd ../backend +# mkdir libs +# cd .. +# cd ols-shared +# mvn clean package +# cp target/ols4-shared-1.0.0-SNAPSHOT.jar ../dataload/libs/ols4-shared-1.0.0-SNAPSHOT.jar +# cp target/ols4-shared-1.0.0-SNAPSHOT.jar ../backend/libs/ols4-shared-1.0.0-SNAPSHOT.jar - name: Build and push ols4 dataload Docker image run: | diff --git a/backend/Dockerfile b/backend/Dockerfile index 3dc971aca..e224ff95d 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,6 @@ -FROM maven:3.6.3-adoptopenjdk-14 +#FROM maven:3.6.3-adoptopenjdk-14 +FROM maven:3.8-jdk-11 RUN mkdir /opt/ols && mkdir /opt/ols/backend && mkdir /opt/ols/ols-shared COPY ./backend /opt/ols/backend