Skip to content

Commit

Permalink
Changed image
Browse files Browse the repository at this point in the history
  • Loading branch information
henrietteharmse committed Jul 25, 2024
1 parent a55f89f commit 3e7c9b0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
3 changes: 2 additions & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 3e7c9b0

Please sign in to comment.