From 7df518d7dbc17257e3d628a5a505fcaf0a59d368 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sat, 16 May 2020 17:40:04 -0400 Subject: [PATCH] set image --- .gitlab-ci.yml | 2 +- Dockerfile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a31a4d..91994ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,4 +35,4 @@ deploy_to_prod: - curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl - chmod +x /usr/local/bin/kubectl - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash - - helm template $CI_PROJECT_NAME --set tag=$CI_COMMIT_TAG ./helm | kubectl apply -f - \ No newline at end of file + - helm template $CI_PROJECT_NAME --set tag=$CI_COMMIT_TAG --set image=$CI_REGISTRY_IMAGE ./helm | kubectl apply -f - \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 9b4c9c3..e37adb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM openjdk:8-slim -RUN apt update && apt install -y rsync - WORKDIR /mc_server COPY ./server .