Compare commits
21 Commits
73cad693a1
...
1.0.5
Author | SHA1 | Date | |
---|---|---|---|
ce18848bb0 | |||
37254883a4 | |||
722f32e0a9 | |||
d97b679f1e | |||
4bfa632dff | |||
0c30da7e6d | |||
2fcf3ad3a2 | |||
930c550385 | |||
ea31268ef5 | |||
c1b575f5a9 | |||
ad67e1831b | |||
7330851694 | |||
62829cecad | |||
afa3886de5 | |||
d066bed021 | |||
1cf9089e33 | |||
9aeb4b44b4 | |||
f3f6fd7be5 | |||
138fa27962 | |||
234992141c | |||
89d9610ba8 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1 @@
|
|||||||
*.swp
|
*.swp
|
||||||
/files
|
|
||||||
|
@@ -2,14 +2,14 @@
|
|||||||
# This guy is awesome: https://dev.to/bzinoun/gitlab-ci-to-build-and-push-containers-to-registry-538a
|
# 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:
|
variables:
|
||||||
# DinD's vfs driver is pretty intensive; this is less so
|
# DinD's vfs driver is pretty intensive; this is less so
|
||||||
DOCKER_DRIVER: overlay2
|
DOCKER_DRIVER: overlay2
|
||||||
CI_HUB_USERNAME: rehashedsalt
|
CI_HUB_USERNAME: rehashedsalt
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
- test
|
# - test
|
||||||
- push
|
- push
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
@@ -25,21 +25,29 @@ Build:
|
|||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest || true
|
- docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest || true
|
||||||
|
- docker buildx create --use
|
||||||
- >
|
- >
|
||||||
docker build
|
docker buildx build
|
||||||
--pull
|
--pull
|
||||||
|
--platform linux/amd64,linux/arm64
|
||||||
--cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
|
--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:$CI_COMMIT_SHORT_SHA
|
||||||
|
--push
|
||||||
.
|
.
|
||||||
- docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
- docker images
|
||||||
|
|
||||||
# TEST
|
# TEST
|
||||||
Test_HTTP_200:
|
# TODO: Fix this
|
||||||
stage: test
|
#Test_HTTP_200:
|
||||||
script:
|
# stage: test
|
||||||
- docker run -d -p 8889:80 $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
# script:
|
||||||
- curl localhost:8889 | grep -ie '200 OK'
|
# - apk add curl
|
||||||
- docker kill $(docker ps -q)
|
# - 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
|
||||||
Push_When_Tag:
|
Push_When_Tag:
|
||||||
@@ -52,11 +60,12 @@ Push_When_Tag:
|
|||||||
docker tag
|
docker tag
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
|
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
|
||||||
- docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
|
|
||||||
- >
|
- >
|
||||||
docker tag
|
docker tag
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
|
$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
|
- docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
|
||||||
Push_Bleeding:
|
Push_Bleeding:
|
||||||
stage: push
|
stage: push
|
||||||
@@ -66,4 +75,5 @@ Push_Bleeding:
|
|||||||
docker tag
|
docker tag
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
|
$CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
|
||||||
|
- docker images
|
||||||
- docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
|
- docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
|
||||||
|
@@ -1,4 +1,3 @@
|
|||||||
FROM php:7-apache
|
FROM php:7-apache
|
||||||
COPY ./ /var/www/html/
|
COPY ./ /var/www/html/
|
||||||
RUN mkdir /var/www/html/files
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
0
files/.keep
Normal file
0
files/.keep
Normal file
1
minecraft/packs/current
Symbolic link
1
minecraft/packs/current
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
null
|
@@ -124,8 +124,12 @@
|
|||||||
// - Brett
|
// - Brett
|
||||||
"\"Be grody on my back. Wait-\"",
|
"\"Be grody on my back. Wait-\"",
|
||||||
// - Brett
|
// - Brett
|
||||||
|
"\"Let's get this cock onto a tray!\"",
|
||||||
|
// - Brett
|
||||||
"\"This is Hell, they are all prostitutes.\"",
|
"\"This is Hell, they are all prostitutes.\"",
|
||||||
// - Jordyn
|
// - Jordyn
|
||||||
|
"\"Isn't an asshole like a brass instrument?\"",
|
||||||
|
// - Jordyn
|
||||||
"\"Sir, this is an M32 grenade launcher\"",
|
"\"Sir, this is an M32 grenade launcher\"",
|
||||||
// - Jacob https://www.youtube.com/watch?v=DJRkFLFnv3c
|
// - Jacob https://www.youtube.com/watch?v=DJRkFLFnv3c
|
||||||
"\"OHNO!\"",
|
"\"OHNO!\"",
|
||||||
@@ -162,8 +166,14 @@
|
|||||||
// - Jacob, after I said he's my little pogchamp
|
// - Jacob, after I said he's my little pogchamp
|
||||||
"\"They're children you thirsty whores\"",
|
"\"They're children you thirsty whores\"",
|
||||||
// - Sam
|
// - Sam
|
||||||
|
"\"Pichu is illegal\"",
|
||||||
|
// - Sam
|
||||||
|
"\"DEDEDE FUCKS\"",
|
||||||
|
// - Sam
|
||||||
"\"Imagine 'Blades of Glory' but they fuck\"",
|
"\"Imagine 'Blades of Glory' but they fuck\"",
|
||||||
// - Also Sam
|
// - Also Sam
|
||||||
|
"\"There's no D in BDSM\"",
|
||||||
|
// - Rachael
|
||||||
"God dammit, Sam",
|
"God dammit, Sam",
|
||||||
"God dammit, Jacob",
|
"God dammit, Jacob",
|
||||||
"God dammit",
|
"God dammit",
|
||||||
|
@@ -23,6 +23,7 @@
|
|||||||
<h4>desu.ltd</h4>
|
<h4>desu.ltd</h4>
|
||||||
<a href="https://desu.ltd">Index</a>
|
<a href="https://desu.ltd">Index</a>
|
||||||
<a href="https://git.desu.ltd">Gitea</a>
|
<a href="https://git.desu.ltd">Gitea</a>
|
||||||
|
<a href="http://local.desu.ltd">Local</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="spsubsection">
|
<div class="spsubsection">
|
||||||
<h4>9iron</h4>
|
<h4>9iron</h4>
|
||||||
|
Reference in New Issue
Block a user