diff --git a/base/old-alpine/Dockerfile b/base/old-alpine/Dockerfile index f42bba8..59bbd2a 100644 --- a/base/old-alpine/Dockerfile +++ b/base/old-alpine/Dockerfile @@ -1,13 +1,20 @@ -FROM alpine +FROM alpine:edge + +RUN apk add -U --no-cache tini -# Add Tini -ENV TINI_VERSION v0.8.3 -ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static /tini -RUN chmod +x /tini ADD ./entrypoint.sh / ENTRYPOINT ["/entrypoint.sh"] +# Add Backplane agent +ENV BACKPLANE_AGENT_VERSION 1.0.8 +RUN apk add -U --no-cache wget ca-certificates \ + && wget https://bin.equinox.io/c/jWahGASjoRq/backplane-stable-linux-amd64.tgz \ + && tar xf backplane-stable-linux-amd64.tgz \ + && mv backplane /usr/bin/backplane \ + && rm backplane-stable-linux-amd64.tgz \ + && apk del wget ca-certificates + # update to edge ADD repositories /etc/apk/repositories -RUN apk update && apk upgrade && apk add runit +RUN apk add -U --no-cache runit ADD runit/ /etc/system diff --git a/base/old-alpine/entrypoint.sh b/base/old-alpine/entrypoint.sh index 9147088..44b9db7 100755 --- a/base/old-alpine/entrypoint.sh +++ b/base/old-alpine/entrypoint.sh @@ -4,4 +4,4 @@ set -e runsvdir /etc/system & -exec /tini -- $* +exec /sbin/tini -- $* diff --git a/base/old-alpine/runit/backplane/run b/base/old-alpine/runit/backplane/run new file mode 100755 index 0000000..9478b15 --- /dev/null +++ b/base/old-alpine/runit/backplane/run @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -n "$BACKPLANE_TOKEN" ] +then + /usr/bin/backplane connect +fi diff --git a/compose/wordpress/docker-compose.yml b/compose/wordpress/docker-compose.yml index f864c74..bf6ee1b 100644 --- a/compose/wordpress/docker-compose.yml +++ b/compose/wordpress/docker-compose.yml @@ -1,11 +1,34 @@ -wordpress: - image: wordpress - links: - - db:mysql - ports: - - 8080:80 +version: '2' -db: - image: mariadb - environment: - MYSQL_ROOT_PASSWORD: example +services: + wordpress: + image: wordpress + + environment: + WORDPRESS_DB_USER: root + WORDPRESS_DB_PASSWORD: example + WORDPRESS_DB_NAME: test + + backplane: + image: backplaneio/backplane + # Settings for the backplane agent + environment: + # Contains your backplane connect token (secret) + BACKPLANE_TOKEN: H09187NeTkOKHMYPZMTb4ftDISdQFhWJTFUzZshB7czadnweulfRv09A5tcxwyVk9iG1bxj-OT1zb4-j5n1z + + # The URL that the backplane agent will proxy to/from. + # This by default will route to/from the linked app 'some-webapp'. + BACKPLANE_PROXY_URL: http://wordpress:80 + + # Your labels for this agent to use. + # EX: endpoint:example.com release:v1 + BACKPLANE_LABELS: "endpoint:mota.cf release:v1" + + # Change this to whatever your application service name is + links: + - wordpress:webapp + + db: + image: mariadb + environment: + MYSQL_ROOT_PASSWORD: example diff --git a/games/minecraft/Dockerfile b/games/minecraft/Dockerfile index a32dca4..1b0b9e6 100644 --- a/games/minecraft/Dockerfile +++ b/games/minecraft/Dockerfile @@ -6,10 +6,10 @@ RUN useradd --create-home minecraft ADD ./eula.txt /minecraft/data/eula.txt ADD ./server.properties /minecraft/data/server.properties -ADD https://s3.amazonaws.com/Minecraft.Download/versions/1.8.7/minecraft_server.1.8.7.jar /minecraft/minecraft_server.1.8.7.jar +ADD https://s3.amazonaws.com/Minecraft.Download/versions/1.10.2/minecraft_server.1.10.2.jar /minecraft/minecraft_server.jar ADD runit/ /etc/service -RUN chmod a+r /minecraft/minecraft_server.1.8.7.jar +RUN chmod a+r /minecraft/minecraft_server.jar VOLUME /minecraft/data diff --git a/games/minecraft/runit/minecraft/run b/games/minecraft/runit/minecraft/run index c3bfe42..d2c8bd9 100755 --- a/games/minecraft/runit/minecraft/run +++ b/games/minecraft/runit/minecraft/run @@ -4,4 +4,4 @@ chmod -R a+rw /minecraft cd /minecraft/data -setuser minecraft java -jar /minecraft/minecraft_server.1.8.7.jar +setuser minecraft java -jar /minecraft/minecraft_server.jar diff --git a/games/minecraft/server.properties b/games/minecraft/server.properties index 76c2ca8..946e79c 100644 --- a/games/minecraft/server.properties +++ b/games/minecraft/server.properties @@ -4,7 +4,7 @@ generator-settings= use-native-transport=true op-permission-level=4 resource-pack-hash= -level-name=world +level-name=SkyGrid allow-flight=false announce-player-achievements=true server-port=25565 @@ -31,7 +31,7 @@ max-players=20 spawn-monsters=true view-distance=10 generate-structures=true -motd=A Minecraft Server +motd=Skygrid server for minecraft rcon.password=swag enable-rcon=true rcon.port=25575 diff --git a/base/alpine-nim/.gitignore b/lang/nim/.gitignore similarity index 100% rename from base/alpine-nim/.gitignore rename to lang/nim/.gitignore diff --git a/base/alpine-nim/Dockerfile b/lang/nim/Dockerfile similarity index 79% rename from base/alpine-nim/Dockerfile rename to lang/nim/Dockerfile index cbf7bcd..44339d1 100644 --- a/base/alpine-nim/Dockerfile +++ b/lang/nim/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine:3.4 +FROM xena/alpine ENV PATH=$PATH:/opt/nim/bin:/root/.nimble/bin -ENV NIM_VERSION 0.14.0 -ENV NIM_DOWNLOAD_URL http://nim-lang.org/download/nim-0.14.0.tar.xz +ENV NIM_VERSION 0.14.2 +ENV NIM_DOWNLOAD_URL http://nim-lang.org/download/nim-0.14.2.tar.xz RUN apk update && \ apk add libc-dev gcc curl libgcc git perl xz tar && \ @@ -10,7 +10,7 @@ RUN apk update && \ mkdir -p /opt && cd /opt && \ curl -LO $NIM_DOWNLOAD_URL && \ /usr/bin/tar xJf nim-$NIM_VERSION.tar.xz && rm -f nim-$NIM_VERSION.tar.xz && \ - mv nim-0.14.0 nim && cd nim && \ + mv nim-0.14.2 nim && cd nim && \ sh build.sh && \ cd .. && git clone https://github.com/nim-lang/nimble.git && \ cd nimble && \ diff --git a/base/alpine-nim/LICENSE b/lang/nim/LICENSE similarity index 100% rename from base/alpine-nim/LICENSE rename to lang/nim/LICENSE diff --git a/base/alpine-nim/README.md b/lang/nim/README.md similarity index 100% rename from base/alpine-nim/README.md rename to lang/nim/README.md diff --git a/base/alpine-nim/hello.nim b/lang/nim/hello.nim similarity index 100% rename from base/alpine-nim/hello.nim rename to lang/nim/hello.nim