From 53ce3f3aad427f89252712a19c170123cc7eb8dd Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Mon, 14 Feb 2022 19:17:15 +0100
Subject: [PATCH] move to new gitlab host

---
 .editorconfig                              | 12 ------------
 .gitlab-ci.yml                             | 21 +++++++++++++--------
 rootfs/bin/db-password                     |  2 +-
 rootfs/bin/initdb                          |  2 +-
 rootfs/etc/s6-overlay/s6-rc.d/postgres/run |  2 +-
 5 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index d1f040a..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb046c9..dfb18cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,18 @@
 variables:
-  IMAGE_NAME: thallian/postgres
+  CONTAINER_NAME: thallian/postgres
 
 build:
   stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
-    - docker build -t $IMAGE_NAME:latest .
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA
-    - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
-    - docker push $IMAGE_NAME:latest
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
+    - >-
+      /kaniko/executor
+      --context "$CI_PROJECT_DIR"
+      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
+      --destination "$CONTAINER_NAME:latest"
diff --git a/rootfs/bin/db-password b/rootfs/bin/db-password
index 838dd45..ed70898 100755
--- a/rootfs/bin/db-password
+++ b/rootfs/bin/db-password
@@ -1,4 +1,4 @@
-#!/command/with-contenv sh
+#!/bin/sh
 
 echo "local all all trust" > "$PGDATA/pg_hba.conf"
 
diff --git a/rootfs/bin/initdb b/rootfs/bin/initdb
index ea0a192..ccd0f24 100755
--- a/rootfs/bin/initdb
+++ b/rootfs/bin/initdb
@@ -1,4 +1,4 @@
-#!/command/with-contenv sh
+#!/bin/sh
 
 if [ ! -f "$PGDATA/PG_VERSION" ]; then
     initdb --username=postgres
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/postgres/run b/rootfs/etc/s6-overlay/s6-rc.d/postgres/run
index ccd2baa..8a91f35 100644
--- a/rootfs/etc/s6-overlay/s6-rc.d/postgres/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/postgres/run
@@ -1,4 +1,4 @@
-#!/command/with-contenv sh
+#!/bin/sh
 
 exec s6-setuidgid postgres postgres \
     -D $PGDATA \