From 6b52b086195f9dc73225f9f3e355060292a0920f Mon Sep 17 00:00:00 2001 From: Ildar Galeev Date: Tue, 22 Sep 2020 12:21:58 +0300 Subject: [PATCH] Switch to alpine (#290) --- Dockerfile.sh | 2 -- Makefile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile.sh b/Dockerfile.sh index 7617d539..1f29e117 100755 --- a/Dockerfile.sh +++ b/Dockerfile.sh @@ -4,8 +4,6 @@ FROM $BASE_IMAGE MAINTAINER Rinat Arsaev COPY dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/vhosts.d/dashboard.conf -COPY containerpilot.json /etc/containerpilot.json -CMD /bin/containerpilot -config file:///etc/containerpilot.json /usr/sbin/nginx -g "daemon off;" EXPOSE 8080 LABEL base_image_tag=$BASE_IMAGE_TAG LABEL build_image_tag=$BUILD_IMAGE_TAG diff --git a/Makefile b/Makefile index 96b82973..1833440e 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ REGISTRY ?= dr2.rbkmoney.com # Base image for the service BASE_IMAGE_NAME := service-fe -BASE_IMAGE_TAG := 2b4570bc1d9631c10aaed2132eb87eb9003f3471 +BASE_IMAGE_TAG := 647d66a59ba89ea42b326ca5156f5d1e1395febc BUILD_IMAGE_TAG := b04c5291d101132e53e578d96e1628d2e6dab0c0