Update gitlab-ci.yml

Unfortunately, I can't use --load, I'll have to use --push directly

.gitignore

@@ -1,2 +1 @@
 *.swp
-/files

.gitlab-ci.yml

@@ -2,15 +2,14 @@
 # This guy is awesome: https://dev.to/bzinoun/gitlab-ci-to-build-and-push-containers-to-registry-538a
 #
 
-image: docker:latest
+image: morlay/buildx:607a2ce
 variables:
   # DinD's vfs driver is pretty intensive; this is less so
   DOCKER_DRIVER: overlay2
   CI_HUB_USERNAME: rehashedsalt
 stages:
   - build
-  - test
+#  - test
-  - push
 services:
   - docker:dind
 before_script:
@@ -25,45 +24,31 @@ Build:
   stage: build
   script:
     - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest || true
+    - docker buildx create --use
     - >
-      docker build
+      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_SHORT_SHA
+      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
+      --push
       .
-    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+    - docker images
-
+Build_Tag:
-# TEST
+  stage: build
-Test_HTTP_200:
-  stage: test
-  script:
-    - docker run -d -p 8889:80 $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
-    - curl localhost:8889 | grep -ie '200 OK'
-    - docker kill $(docker ps -q)
-
-# PUSH
-Push_When_Tag:
-  stage: push
   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
+      docker buildx build
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+      --pull
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+      --platform linux/amd64,linux/arm64
-    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+      --cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
-    - >
+      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-      docker tag
+      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+      --push
-      $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
+      .
-    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
+    - docker images
-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 push $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding

Dockerfile

@@ -1,4 +1,3 @@
 FROM php:7-apache
 COPY ./ /var/www/html/
-RUN mkdir /var/www/html/files
 EXPOSE 80

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>

minecraft/packs/current

@@ -0,0 +1 @@
+null

src/common-subtitle.php

@@ -124,8 +124,12 @@
 		// - Brett
 		"\"Be grody on my back. Wait-\"",
 		// - Brett
+		"\"Let's get this cock onto a tray!\"",
+		// - Brett
 		"\"This is Hell, they are all prostitutes.\"",
 		// - Jordyn
+		"\"Isn't an asshole like a brass instrument?\"",
+		// - Jordyn
 		"\"Sir, this is an M32 grenade launcher\"",
 		// - Jacob https://www.youtube.com/watch?v=DJRkFLFnv3c
 		"\"OHNO!\"",
@@ -162,8 +166,14 @@
 		// - Jacob, after I said he's my little pogchamp
 		"\"They're children you thirsty whores\"",
 		// - Sam
+		"\"Pichu is illegal\"",
+		// - Sam
+		"\"DEDEDE FUCKS\"",
+		// - Sam
 		"\"Imagine 'Blades of Glory' but they fuck\"",
 		// - Also Sam
+		"\"There's no D in BDSM\"",
+		// - Rachael
 		"God dammit, Sam",
 		"God dammit, Jacob",
 		"God dammit",

startpage/index.php

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