Add subtitle

More subtitles
Actually really for real point current to god knows where
2021-04-21 20:01:25 -05:00 · 2021-04-08 14:37:38 -05:00 · 2021-04-08 14:33:49 -05:00 · 2021-03-25 13:01:32 -05:00 · 2021-03-25 01:02:41 -05:00 · 2021-03-25 00:56:04 -05:00
6 changed files with 28 additions and 13 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 *.swp
-/files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,14 +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
@@ -25,21 +25,29 @@ 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
-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)
+# 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:
@@ -52,11 +60,12 @@ 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_Bleeding:
  stage: push
@@ -66,4 +75,5 @@ Push_Bleeding:
      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
--- a/1
+++ b/1
@@ -1,4 +1,3 @@
 FROM php:7-apache
 COPY ./ /var/www/html/
-RUN mkdir /var/www/html/files
 EXPOSE 80
--- a/files/.keep
+++ b/files/.keep
--- a/minecraft/packs/current
+++ b/minecraft/packs/current
@@ -0,0 +1 @@
+null
--- a/src/common-subtitle.php
+++ b/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!\"",
@@ -164,6 +168,8 @@
 		// - 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",
Author	SHA1	Message	Date
Salt	d97b679f1e	Add subtitle	2021-04-21 20:01:25 -05:00
Salt	4bfa632dff	More subtitles	2021-04-08 14:37:38 -05:00
Salt	0c30da7e6d	Actually really for real point current to god knows where	2021-04-08 14:33:49 -05:00
Salt	2fcf3ad3a2	Point current off to god knows where	2021-03-25 13:01:32 -05:00
Salt	930c550385	Alright fuck it, disable testing	2021-03-25 01:02:41 -05:00
Salt	ea31268ef5	Wait for Apache to start up before testing it	2021-03-25 00:56:04 -05:00
Salt	c1b575f5a9	Add more debugging info to the test cases	2021-03-25 00:42:24 -05:00
Salt	ad67e1831b	Oh right --push doesn't take an argument	2021-03-25 00:31:04 -05:00
Salt	7330851694	Fix some issues with docker buildx Unfortunately, I can't use --load, I'll have to use --push directly	2021-03-25 00:24:13 -05:00
Salt	62829cecad	Oh more diag pls	2021-03-20 20:36:24 -05:00
Salt	afa3886de5	Maybe this fixes it? Hopefully I can at least diag from here	2021-03-20 20:36:00 -05:00
Salt	d066bed021	Alright, new approach	2021-03-20 20:30:58 -05:00
Salt	1cf9089e33	Disabel SELinux to fix builds on arm64	2021-03-20 20:27:42 -05:00
Salt	9aeb4b44b4	That image doesn't work; try this one	2021-03-20 18:50:45 -05:00
Salt	f3f6fd7be5	No wait I want this one	2021-03-20 14:28:24 -05:00
Salt	138fa27962	Switch to an image that will have buildx	2021-03-20 14:25:59 -05:00
Salt	234992141c	Set up multi-arch builds	2021-03-20 14:20:43 -05:00
Salt	89d9610ba8	Need to actually add curl. Whoops	2021-03-20 14:17:37 -05:00