Mirrors/monolithic
2
0
Fork 0
mirror of https://github.com/lancachenet/monolithic synced 2024-11-22 03:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

LanCache.Net changes

Browse source
This commit is contained in:
VibroAxe 2019-05-30 21:30:25 +01:00
parent 97501a00e7
commit 9f29675ef1
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.circleci/config.yml
View file

@ -44,11 +44,11 @@ jobs:
name: Save docker image name: Save docker image
command: | command: |
mkdir -p workspace 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: - persist_to_workspace:
root: workspace root: workspace
paths: paths:
steamcache-monolithic.tar lancachenet-monolithic.tar
- store_test_results: - store_test_results:
path: reports path: reports
- store_artifacts: - store_artifacts:
@ -66,6 +66,6 @@ jobs:
name: "Deploy latest to docker hub" name: "Deploy latest to docker hub"
command: | command: |
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
docker load -i /tmp/workspace/steamcache-monolithic.tar docker load -i /tmp/workspace/lancachenet-monolithic.tar
docker tag steamcache/monolithic:goss-test steamcache/monolithic:latest docker tag lancachenet/monolithic:goss-test lancachenet/monolithic:latest
docker push steamcache/monolithic:latest docker push lancachenet/monolithic:latest

4
Dockerfile
View file

@ -1,5 +1,5 @@
FROM steamcache/generic:latest FROM lancachenet/generic:latest
MAINTAINER SteamCache.Net Team <team@steamcache.net> MAINTAINER LanCache.Net Team <team@lancache.net>
ENV GENERICCACHE_VERSION 2 ENV GENERICCACHE_VERSION 2
ENV WEBUSER www-data ENV WEBUSER www-data

8
run-tests.sh
View file

@ -8,7 +8,7 @@ if [ $? -ne 0 ]; then
exit $? exit $?
fi fi
docker build --tag steamcache/monolithic:goss-test . docker build --tag lancachenet/monolithic:goss-test .
case $1 in case $1 in
circleci) circleci)
shift; shift;
@ -18,7 +18,7 @@ case $1 in
shift shift
fi fi
export GOSS_OPTS="$GOSS_OPTS --format junit" 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 #store result for exit code
RESULT=$? RESULT=$?
#delete the junk that goss currently outputs :( #delete the junk that goss currently outputs :(
@ -31,10 +31,10 @@ case $1 in
KEEPIMAGE=true KEEPIMAGE=true
shift shift
fi fi
dgoss run $@ steamcache/monolithic:goss-test dgoss run $@ lancachenet/monolithic:goss-test
RESULT=$? RESULT=$?
;; ;;
esac esac
[[ "$KEEPIMAGE" == "true" ]] || docker rmi steamcache/monolithic:goss-test [[ "$KEEPIMAGE" == "true" ]] || docker rmi lancachenet/monolithic:goss-test
exit $RESULT exit $RESULT