Skip to content

Commit

Permalink
update docker image(#48)
Browse files Browse the repository at this point in the history
* update workflow

* create temporary workflow

* remove dependency

* hardcode version

* update Dockerfile

* remove temporary workflow
  • Loading branch information
EddeCCC committed Sep 22, 2023
1 parent 77710c4 commit 9303e92
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/eumserver_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,17 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup
uses: actions/setup-java@v3
with:
java-version: 17 # Spring 3 needs at least java 17
distribution: temurin
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Install Java 17 # We cannot use the openjdk:17-jdk container, since we also need Docker inside the container
run: sudo apt update && sudo apt install openjdk-17-jdk
- name: Build Docker Images
run: |
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
./gradlew dockerTag -PbuildVersion=${{ github.ref_name }}
run: ./gradlew dockerTag -PbuildVersion=2.5.6
- name: Push Docker Images
run: |
docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASSWORD }}
docker push inspectit/inspectit-ocelot-eum-server:${{ github.ref_name }}
docker push inspectit/inspectit-ocelot-eum-server:2.5.6
docker push inspectit/inspectit-ocelot-eum-server:latest
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM openjdk:11-jre-slim
FROM openjdk:17-jdk-slim

# The docker directory contains the Dockerfile, entrypoint.sh and the eum-server jar to build the docker image.
# So the docker directory gets added to the container to successfully build the docker image.
# The dockerfile gets build in the docker directory where it is in and no new directories are being created.
# =====
# In order to build a docker image locally, the eum-server should be build locally and the resulting jar should be renamed
# to 'inspectit-ocelot-eum-server.jar' and copied to the ./docker directory
ADD ./ /
ADD ./ /
ENTRYPOINT ["sh", "/entrypoint.sh"]

0 comments on commit 9303e92

Please sign in to comment.