From f7cfa565b19354734aeb973138ef42e2dbbb9ad2 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 23 Apr 2022 17:14:24 +0100
Subject: [PATCH] Relocate to GitHub

---
 .../.deepsource.toml => .deepsource.toml      |  0
 .../workflows/build.yml                       | 10 +++++-----
 .gitlab-ci.yml                                | 20 -------------------
 Dockerfile                                    |  2 +-
 .../renovate.json => renovate.json            |  0
 5 files changed, 6 insertions(+), 26 deletions(-)
 rename .github-archive/.deepsource.toml => .deepsource.toml (100%)
 rename {.github-archive => .github}/workflows/build.yml (82%)
 delete mode 100644 .gitlab-ci.yml
 rename .github-archive/renovate.json => renovate.json (100%)

diff --git a/.github-archive/.deepsource.toml b/.deepsource.toml
similarity index 100%
rename from .github-archive/.deepsource.toml
rename to .deepsource.toml
diff --git a/.github-archive/workflows/build.yml b/.github/workflows/build.yml
similarity index 82%
rename from .github-archive/workflows/build.yml
rename to .github/workflows/build.yml
index e6cc039..547e08b 100644
--- a/.github-archive/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,16 +18,16 @@ jobs:
           echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
 
   build:
-    name: GitHub Package Registry
+    name: GitHub Container Registry
     runs-on: ubuntu-latest
     needs: [prepare-data]
     steps:
     - uses: actions/checkout@v2
-    - name: Login to GitHub Package Registry
+    - name: Login
       run: echo ${{ secrets.PAT }} | docker login ghcr.io -u luketainton --password-stdin
-    - name: Build image for GitHub Package Registry
+    - name: Build
       run: docker build . --file Dockerfile --tag ghcr.io/luketainton/hesk:${{ needs.prepare-data.outputs.tag }} --tag ghcr.io/luketainton/hesk:latest
-    - name: Push image to GitHub Package Registry
+    - name: Push
       run: |
         docker push ghcr.io/luketainton/hesk:latest
-        docker push ghcr.io/luketainton/hesk:${{ needs.prepare-data.outputs.tag }}
\ No newline at end of file
+        docker push ghcr.io/luketainton/hesk:${{ needs.prepare-data.outputs.tag }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index ace1c70..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-stages:
-- build
-- upload
-- release
-
-build:
-  stage: build
-  only:
-  - tags
-  image: docker:19.03.12
-  services:
-  - docker:19.03.12-dind
-  variables:
-    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-  script:
-  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  - docker build -t $CI_REGISTRY_IMAGE:latest -t $IMAGE_TAG .
-  - docker build -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest .
-  - docker push $IMAGE_TAG
-  - docker push $CI_REGISTRY_IMAGE:latest
diff --git a/Dockerfile b/Dockerfile
index 800c63a..c083f95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:apache
 LABEL maintainer="Luke Tainton <luke@tainton.uk>"
-LABEL org.opencontainers.image.source="https://gitlab.com/luketainton/hesk-docker"
+LABEL org.opencontainers.image.source="https://github.com/luketainton/hesk-docker"
 COPY --chown=www-data:www-data hesk /srv
 COPY vhost.conf /etc/apache2/sites-enabled/000-default.conf
 RUN apt-get update && \
diff --git a/.github-archive/renovate.json b/renovate.json
similarity index 100%
rename from .github-archive/renovate.json
rename to renovate.json