diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml index d1915fc..efff291 100644 --- a/.github/workflows/build-push-docker.yml +++ b/.github/workflows/build-push-docker.yml @@ -144,20 +144,20 @@ jobs: push: true tags: ${{ steps.docker_tags_server.outputs.tags }} - - name: Build and push Docker images - [ Agent ] - id: docker_build_agent - # You may pin to the exact commit or the version. - # uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 - uses: docker/build-push-action@v3.2.0 - with: - context: ./ - # Path to the Dockerfile - file: ./agent/Dockerfile - # List of target platforms for build - platforms: linux/amd64,linux/arm64 - # Always attempt to pull all referenced images - pull: false - # Push is a shorthand for --output=type=registry - push: true - tags: ${{ steps.docker_tags_agent.outputs.tags }} +# - name: Build and push Docker images - [ Agent ] +# id: docker_build_agent +# # You may pin to the exact commit or the version. +# # uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 +# uses: docker/build-push-action@v3.2.0 +# with: +# context: ./ +# # Path to the Dockerfile +# file: ./agent/Dockerfile +# # List of target platforms for build +# platforms: linux/amd64,linux/arm64 +# # Always attempt to pull all referenced images +# pull: false +# # Push is a shorthand for --output=type=registry +# push: true +# tags: ${{ steps.docker_tags_agent.outputs.tags }} diff --git a/server/Dockerfile b/server/Dockerfile index 5b66842..31c0e43 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,12 +1,9 @@ # Base images that the image needs to depend on -FROM openjdk:11-jre-alpine - -# The name of the maintainer -MAINTAINER super-wdd +FROM icederce/eclipse-temurin-11-jre-focal # Set environment variables -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms2028m -Xmx2048m" # Set time zone RUN set -eux; \ @@ -20,7 +17,7 @@ RUN mkdir -p /wdd WORKDIR /wdd # Copy the jar and rename it -COPY ./target/server-*.jar /server.jar +COPY ./target/server-*.jar /wdd/server.jar # When the docker container starts, run the jar -ENTRYPOINT exec java ${JAVA_OPTS} -jar /wdd/lfs-admin.jar +ENTRYPOINT exec java ${JAVA_OPTS} -jar /wdd/server.jar