From 8d4cf7f6be18afaa7636868fa88bcc7dc715c368 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Mon, 11 Jul 2022 00:14:11 +0200 Subject: build: refactor --- scripts/setup-srht-docker.sh | 3 +-- server/.build.yaml | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/setup-srht-docker.sh b/scripts/setup-srht-docker.sh index 3142a8d..5790130 100755 --- a/scripts/setup-srht-docker.sh +++ b/scripts/setup-srht-docker.sh @@ -7,6 +7,5 @@ IFS=$'\n\t' sudo mount -t tmpfs -o size=4G /dev/null /dev/shm sleep 2 sudo nohup dockerd --bip 172.18.0.1/16 /dev/null 2>&1 & -sudo addgroup $(whoami) docker +sudo usermod -aG docker $(whoami) sudo service docker start - diff --git a/server/.build.yaml b/server/.build.yaml index 4945dcb..b840a55 100644 --- a/server/.build.yaml +++ b/server/.build.yaml @@ -1,7 +1,7 @@ arch: null artifacts: [ ] environment: { } -image: alpine/latest +image: ubuntu/lts packages: - docker repositories: { } @@ -14,12 +14,10 @@ tasks: - setup: | bash ~/greatoffice/scripts/setup-srht-docker.sh - build: | - sudo service docker start CURRENT_DEV_VERSION=$(cat ~/greatoffice/server/.version-dev) CURRENT_DEV_VERSION_INT=${CURRENT_DEV_VERSION//[!0-9]/} docker build -t greatoffice/server:$CURRENT_DEV_VERSION_INT ~/greatoffice/server - publish: | - sudo service docker start DOCKER_PASS=$(cat ~/.dockerpassword) CURRENT_DEV_VERSION=$(cat ~/greatoffice/server/.version-dev) CURRENT_DEV_VERSION_INT=${CURRENT_DEV_VERSION//[!0-9]/} -- cgit v1.3