From 73288cb4cbaca30d04d70e33922f73b855b1d174 Mon Sep 17 00:00:00 2001
From: ivarlovlie <git@ivarlovlie.no>
Date: Mon, 11 Jul 2022 00:33:45 +0200
Subject: build: RC sourcehut building

---
 server/.build.yaml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'server')

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: [ ]
-- 
cgit v1.3