From b20acc86c2f53218505661262fc6a8667f66173d Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sat, 16 Feb 2019 18:36:51 +0100 Subject: [PATCH] a change to test deploy target --- .gitlab-ci.yml | 5 +++-- Dockerfile | 2 +- VERSION | 2 +- build.sh | 5 ----- docroot/index.pag | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) delete mode 100755 build.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd0e871..124195a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ deploy: - linux - docker script: - - version=`cat VERSION` + - VERSION=`cat VERSION` - echo "Version is $VERSION" - + - docker pull registry.gitlab.com/wolutator/homepage:latest + - docker restart homepage diff --git a/Dockerfile b/Dockerfile index 9efd13a..6f0dbd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ COPY files files/ COPY docroot docroot/ COPY src src/ COPY homepage.conf package.json package-lock.json tsconfig.json ./ - +COPY VERSION . RUN \ diff --git a/VERSION b/VERSION index 7dea76e..6d7de6e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 +1.0.2 diff --git a/build.sh b/build.sh deleted file mode 100755 index 2b0c945..0000000 --- a/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -docker build --tag registry.gitlab.com/wolutator/homepage:latest --tag registry.gitlab.com/wolutator/homepage:1.1 . - - diff --git a/docroot/index.pag b/docroot/index.pag index d22fc69..7c0cdc3 100644 --- a/docroot/index.pag +++ b/docroot/index.pag @@ -1,4 +1,4 @@ - +