Commit 7b038cd3 authored by nanahira's avatar nanahira

Merge branch 'master' into plus

parents 84e24906 c848a6a6
stages:
- build
- deploy
variables:
GIT_DEPTH: "1"
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
build:
stage: build
tags:
- docker
script:
- docker build --pull -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE
deploy_latest:
stage: deploy
tags:
- docker
script:
- docker pull $CONTAINER_TEST_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
- docker push $CONTAINER_RELEASE_IMAGE
only:
- master
deploy_tag:
stage: deploy
tags:
- docker
variables:
CONTAINER_TAG_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
script:
- docker pull $CONTAINER_TEST_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_TAG_IMAGE
- docker push $CONTAINER_TAG_IMAGE
only:
- tags
...@@ -7,12 +7,11 @@ FROM debian:buster-slim ...@@ -7,12 +7,11 @@ FROM debian:buster-slim
RUN apt update && \ RUN apt update && \
env DEBIAN_FRONTEND=noninteractive apt -y install wget gnupg ca-certificates software-properties-common apt-transport-https sudo && \ env DEBIAN_FRONTEND=noninteractive apt -y install wget gnupg ca-certificates software-properties-common apt-transport-https sudo && \
wget -O - https://nginx.org/keys/nginx_signing.key | apt-key add - && \ wget -O - https://nginx.org/keys/nginx_signing.key | apt-key add - && \
echo "deb http://192.168.1.4:8888/nginx-plus/debian $(lsb_release -sc) nginx-plus" >> /etc/apt/sources.list.d/nginx.list && \ echo "deb https://nginx.org/packages/mainline/debian/ $(lsb_release -sc) nginx" >> /etc/apt/sources.list.d/nginx.list && \
echo "deb-src https://nginx.org/packages/mainline/debian/ $(lsb_release -sc) nginx" >> /etc/apt/sources.list.d/nginx.list && \
apt update && \ apt update && \
env DEBIAN_FRONTEND=noninteractive apt -y install nginx-plus rsync logrotate openssh-server python locales cron && \ env DEBIAN_FRONTEND=noninteractive apt -y install nginx rsync logrotate openssh-server python locales cron && \
rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* /usr/lib/nginx-plus/check-subscription rm -rf /var/lib/apt/lists/*
COPY ./dummy /usr/lib/nginx-plus/check-subscription
# configures # configures
RUN echo '0 4 * * * /usr/sbin/logrotate /etc/logrotate.conf' > /etc/cron.d/logrotate && \ RUN echo '0 4 * * * /usr/sbin/logrotate /etc/logrotate.conf' > /etc/cron.d/logrotate && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment