complete CI - 1

This commit is contained in:
zeaslity
2022-11-22 17:40:40 +08:00
parent b689fa7590
commit 0d4f52ef4e
2 changed files with 20 additions and 23 deletions

View File

@@ -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 }}

View File

@@ -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