From 4aedd919f86fb446199d970895af7c5135fc72f3 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Wed, 16 Oct 2024 00:23:38 +1100
Subject: [PATCH] Change to gitea workflow

---
 .gitlab-ci.yml                  | 31 -------------------------------
 .gitlab-docker-manifest.yml     | 10 ----------
 .gitlab-docker-x86_64.yml       | 16 ----------------
 Dockerfile => docker/Dockerfile |  4 ++--
 init => docker/init-docker      |  0
 5 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 .gitlab-ci.yml
 delete mode 100644 .gitlab-docker-manifest.yml
 delete mode 100644 .gitlab-docker-x86_64.yml
 rename Dockerfile => docker/Dockerfile (91%)
 rename init => docker/init-docker (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 953346b..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-stages:
-- build
-- build-manifest
-
-variables:
-  VERSION: latest
-  DOCKER_HOST: tcp://docker:2375
-  VERSIONARCH: ${VERSION}-${ARCH}
-
-cache:
-  key: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG}
-  paths:
-  - build-cache
-
-image: docker:latest
-services:
-- docker:dind
-
-before_script:
-- if [ ! -d build-cache ]; then mkdir build-cache; fi
-- sed -i -e s'/https/http/' /etc/apk/repositories
-- HTTP_PROXY=http://proxy.dege.lan:3128 apk add git curl
-- docker info && docker version
-# env|sort
-- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
-
-include:
-- .gitlab-docker-x86_64.yml
-# .gitlab-docker-armv7l.yml
-# .gitlab-docker-arm64.yml
-- .gitlab-docker-manifest.yml
diff --git a/.gitlab-docker-manifest.yml b/.gitlab-docker-manifest.yml
deleted file mode 100644
index 1eddfc3..0000000
--- a/.gitlab-docker-manifest.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-x86_64:build-manifest:
-  stage: build-manifest
-  script:
-  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 #${CI_REGISTRY_IMAGE}:${VERSION}-arm64 ${CI_REGISTRY_IMAGE}:${VERSION}-armv7l
-  - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}
-  tags:
-  - docker
-  - x86_64
-  only:
-  - master
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
deleted file mode 100644
index 77741bd..0000000
--- a/.gitlab-docker-x86_64.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-x86_64:build:
-  variables:
-    ARCH: x86_64
-  stage: build
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
-  - rm build-cache/* || true
-  - docker build --build-arg HTTP_PROXY=http://proxy.dege.lan:3128 --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
-  - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
-  tags:
-  - docker
-  - x86_64
-  only:
-  - master
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 91%
rename from Dockerfile
rename to docker/Dockerfile
index 0f2c85c..06c54c8 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -18,11 +18,11 @@ RUN adduser -g "Hosting Admin User" -u 1000 -G www-data -h /home/lamp -HD lamp\
 # DB Clients
 RUN apk add --no-cache mariadb-client postgresql-client
 
-COPY init /sbin/
+COPY docker/init-docker /sbin/
 
 
 VOLUME [ "/etc/ssh/keys","/home/lamp" ]
 EXPOSE 22
 
 # Starting
-ENTRYPOINT [ "/sbin/init" ]
+ENTRYPOINT [ "/sbin/init-docker" ]
diff --git a/init b/docker/init-docker
similarity index 100%
rename from init
rename to docker/init-docker