From 9f29675ef1f1e5513c3386a8cabbd51c58d89f90 Mon Sep 17 00:00:00 2001 From: VibroAxe Date: Thu, 30 May 2019 21:30:25 +0100 Subject: [PATCH] LanCache.Net changes --- .circleci/config.yml | 10 +++++----- Dockerfile | 4 ++-- run-tests.sh | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3bb5ac..a372b62 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,11 +44,11 @@ jobs: name: Save docker image command: | mkdir -p workspace - docker save -o workspace/steamcache-monolithic.tar steamcache/monolithic:goss-test + docker save -o workspace/lancachenet-monolithic.tar lancachenet/monolithic:goss-test - persist_to_workspace: root: workspace paths: - steamcache-monolithic.tar + lancachenet-monolithic.tar - store_test_results: path: reports - store_artifacts: @@ -66,6 +66,6 @@ jobs: name: "Deploy latest to docker hub" command: | docker login -u $DOCKER_USER -p $DOCKER_PASS - docker load -i /tmp/workspace/steamcache-monolithic.tar - docker tag steamcache/monolithic:goss-test steamcache/monolithic:latest - docker push steamcache/monolithic:latest + docker load -i /tmp/workspace/lancachenet-monolithic.tar + docker tag lancachenet/monolithic:goss-test lancachenet/monolithic:latest + docker push lancachenet/monolithic:latest diff --git a/Dockerfile b/Dockerfile index 225fef8..c73de1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM steamcache/generic:latest -MAINTAINER SteamCache.Net Team +FROM lancachenet/generic:latest +MAINTAINER LanCache.Net Team ENV GENERICCACHE_VERSION 2 ENV WEBUSER www-data diff --git a/run-tests.sh b/run-tests.sh index 0dfdb29..a81ea41 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -8,7 +8,7 @@ if [ $? -ne 0 ]; then exit $? fi -docker build --tag steamcache/monolithic:goss-test . +docker build --tag lancachenet/monolithic:goss-test . case $1 in circleci) shift; @@ -18,7 +18,7 @@ case $1 in shift fi export GOSS_OPTS="$GOSS_OPTS --format junit" - dgoss run $@ steamcache/monolithic:goss-test > reports/goss/report.xml + dgoss run $@ lancachenet/monolithic:goss-test > reports/goss/report.xml #store result for exit code RESULT=$? #delete the junk that goss currently outputs :( @@ -31,10 +31,10 @@ case $1 in KEEPIMAGE=true shift fi - dgoss run $@ steamcache/monolithic:goss-test + dgoss run $@ lancachenet/monolithic:goss-test RESULT=$? ;; esac -[[ "$KEEPIMAGE" == "true" ]] || docker rmi steamcache/monolithic:goss-test +[[ "$KEEPIMAGE" == "true" ]] || docker rmi lancachenet/monolithic:goss-test exit $RESULT