More subtitles

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

.gitignore

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

.gitlab-ci.yml

@@ -2,13 +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
   - push
 services:
   - docker:dind
@@ -19,18 +20,36 @@ before_script:
 after_script:
   - docker logout hub.docker.com
 
+# BUILD
 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
+      --push
       .
-    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+    - 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
   only:
@@ -41,14 +60,14 @@ Push_When_Tag:
       docker tag
       $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
       $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-    - docker push $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 images
+    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
     - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
-
-Push_Latest:
+Push_Bleeding:
   stage: push
   script:
     - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
@@ -56,4 +75,5 @@ Push_Latest:
       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

README.md

@@ -6,7 +6,15 @@ A website for me and my friends.
 
 This repo is a ready-to-go webroot. `git clone` and configure Apache. `git pull` for updates.
 
-You may also use the Docker image at `rehashedsalt/9iron:latest`
+## Docker
+
+You can pull the image from `rehashedsalt/9iron`. The `:latest` tag will always have the latest git tag applied and the `:bleeding` tag will always be the latest *commit*.
+
+The following directories contain stateful content that you will be interested in keeping in a PV:
+
+* `/var/www/html/files`
+
+The image listens on `:80` and does not terminate SSL; proxy connections if you're interested in that.
 
 ## Random Subtitles
 

deploy.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# post-deploy.sh
-# Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
-#
-# Distributed under terms of the MIT license.
-#
-
-ssh -t salt@www.9iron.club sudo git -C /var/www/www.9iron.club pull
-

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!\"",

test.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# test.sh
-# Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
-#
-# Distributed under terms of the MIT license.
-#
-
-php -S localhost:8000
-