From 74d4388e85efef8993d324a44520675e2bf6d276 Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Tue, 8 Feb 2022 21:49:02 +0800 Subject: [PATCH] adjust placeholder --- Dockerfile | 8 ++++---- k8s-deploy-template.yaml | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index b66a3d3..f1e88ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:11-jre-alpine as builder -COPY {JAR_FILE} {APP_NAME}.jar -RUN java -Djarmode=layertools -jar {APP_NAME}.jar extract +COPY ${JAR_FILE} ${APP_NAME}.jar +RUN java -Djarmode=layertools -jar ${APP_NAME}.jar extract FROM eclipse-temurin:11-jre-alpine COPY --from=builder dependencies/ ./ @@ -8,7 +8,7 @@ COPY --from=builder snapshot-dependencies/ ./ COPY --from=builder spring-boot-loader/ ./ COPY --from=builder application/ ./ -RUN mkdir -p /data/logs/{APP_NAME} +RUN mkdir -p /data/logs/${APP_NAME} RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -ENTRYPOINT java org.springframework.boot.loader.JarLauncher --spring.profiles.active={PROFILE} \ No newline at end of file +ENTRYPOINT java org.springframework.boot.loader.JarLauncher --spring.profiles.active=${PROFILE} diff --git a/k8s-deploy-template.yaml b/k8s-deploy-template.yaml index bb6ae55..d1740f1 100644 --- a/k8s-deploy-template.yaml +++ b/k8s-deploy-template.yaml @@ -1,29 +1,29 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {APP_NAME} - namespace: {NAMESPACE} + name: ${APP_NAME} + namespace: ${NAMESPACE} labels: - app: {APP_NAME} + app: ${APP_NAME} spec: - replicas: {REPLICAS} + replicas: ${REPLICAS} selector: matchLabels: - app: {APP_NAME} + app: ${APP_NAME} template: metadata: labels: - app: {APP_NAME} + app: ${APP_NAME} annotations: armsPilotAutoEnable: "on" - armsPilotCreateAppName: "{APP_NAME}" + armsPilotCreateAppName: "${APP_NAME}" spec: containers: - - name: {APP_NAME} - image: {IMAGE} + - name: ${APP_NAME} + image: ${IMAGE} imagePullPolicy: "Always" ports: - - containerPort: {PORT} + - containerPort: ${PORT} livenessProbe: httpGet: scheme: HTTP @@ -39,4 +39,4 @@ spec: initialDelaySeconds: 30 periodSeconds: 10 imagePullSecrets: - - name: kp-schbrain \ No newline at end of file + - name: kp-schbrain -- GitLab