summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/setup-srht-docker.sh11
-rw-r--r--server/.build.yaml15
2 files changed, 5 insertions, 21 deletions
diff --git a/scripts/setup-srht-docker.sh b/scripts/setup-srht-docker.sh
deleted file mode 100755
index 5790130..0000000
--- a/scripts/setup-srht-docker.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Enable bash strict mode
-set -euo pipefail
-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 >/dev/null 2>&1 &
-sudo usermod -aG docker $(whoami)
-sudo service docker start
diff --git a/server/.build.yaml b/server/.build.yaml
index b840a55..ccfeced 100644
--- a/server/.build.yaml
+++ b/server/.build.yaml
@@ -1,28 +1,23 @@
arch: null
-artifacts: [ ]
environment: { }
image: ubuntu/lts
packages:
- - docker
-repositories: { }
+ - docker.io
secrets:
- 866a99d5-ea52-4aa1-acda-c39949460867
shell: true
sources:
- https://git.ivar.systems/greatoffice#master
tasks:
- - setup: |
- bash ~/greatoffice/scripts/setup-srht-docker.sh
- build: |
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
+ sudo docker build -t greatoffice/server:$CURRENT_DEV_VERSION_INT ~/greatoffice/server
- publish: |
- DOCKER_PASS=$(cat ~/.dockerpassword)
CURRENT_DEV_VERSION=$(cat ~/greatoffice/server/.version-dev)
CURRENT_DEV_VERSION_INT=${CURRENT_DEV_VERSION//[!0-9]/}
- docker login dr.ivar.systems -u builder -p $DOCKER_PASS
- docker push dr.ivar.systems/greatoffice/server:$CURRENT_DEV_VERSION_INT
- docker push dr.ivar.systems/greatoffice/server:latest
+ cat ~/.dockerpassword | sudo docker login dr.ivar.systems -u builder --password-stdin
+ sudo docker push dr.ivar.systems/greatoffice/server:$CURRENT_DEV_VERSION_INT
+ sudo docker push dr.ivar.systems/greatoffice/server:latest
complete-build()
triggers: [ ]