Update gitlab-ci.yml

.gitlab-ci.yml

@@ -10,7 +10,6 @@ variables:
 stages:
   - build
 #  - test
-  - push
 services:
   - docker:dind
 before_script:
@@ -32,48 +31,24 @@ Build:
       --platform linux/amd64,linux/arm64
       --cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
       --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
       --push
       .
     - docker images
-
-# TEST
-# TODO: Fix this
-#Test_HTTP_200:
-#  stage: test
-#  script:
-#    - apk add curl
-#    - docker run -d -p 8889:80 $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
-#    - sleep 10
-#    - docker ps
-#    - netstat -tulpn
-#    - curl localhost:8889 | grep -ie '200 OK'
-#    - docker kill $(docker ps -q)
-
-# PUSH
-Push_When_Tag:
-  stage: push
+Build_Tag:
+  stage: build
   only:
     - tags
   script:
-    - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+    - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest || true
+    - docker buildx create --use
     - >
-      docker tag
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-    - >
-      docker tag
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
+      docker buildx build
+      --pull
+      --platform linux/amd64,linux/arm64
+      --cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
+      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
+      --push
+      .
     - docker images
-    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
-Push_Bleeding:
-  stage: push
-  script:
-    - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
-    - >
-      docker tag
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
-    - docker images
-    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding

about/index.php

@@ -11,7 +11,7 @@
 				<h1>About 9iron</h1>
 				<p>9iron is a website spun up by yours truly to unify the services I host and inevitably rope my friends into. It also aggregates documentation about the various games we play.</p>
 				<h1>About Me</h1>
-				<p>I am Salt. I'm a sysadmin and I play video games. I try to be most active on Matrix, but inevitably have to use Discord all the damn time. You can also reach me very effectively through the Fediverse and email.</p>
+				<p>I am Salt. I'm a sysadmin and I play video games. I'm regrettably most active on Discord because there are no good alternatives (that my friends will join). You can also reach me very effectively through the Fediverse and email.</p>
 				<p>Hit me up if you wanna play something or if shit breaks.</p>
 				<dl>
 					<dt>Fedi:</dt>

startpage/index.php

@@ -23,7 +23,7 @@
 					<h4>desu.ltd</h4>
 					<a href="https://desu.ltd">Index</a>
 					<a href="https://git.desu.ltd">Gitea</a>
-					<a href="https://local.desu.ltd">Local</a>
+					<a href="http://local.desu.ltd">Local</a>
 				</div>
 				<div class="spsubsection">
 					<h4>9iron</h4>