From eae545daccf24c4915d6f4f00f558e63f19bd4b0 Mon Sep 17 00:00:00 2001
From: Derkades <robinslot@hotmail.nl>
Date: Fri, 25 Sep 2020 11:51:10 +0200
Subject: [PATCH] dev builds

---
 deploy.sh             | 14 ++++++++------
 php_fpm/Dockerfile    |  5 ++---
 php_fpm/entrypoint.sh |  6 +++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 2023050..533c3ac 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
+
+# Before running this, you need to install binfmt_misc support and create a builder:
+# docker run --privileged --rm tonistiigi/binfmt --install all
+# export DOCKER_CLI_EXPERIMENTAL=enabled
+# docker buildx create --use --name mybuilder
+# https://github.com/docker/buildx
 set -e
-docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
+
 export DOCKER_CLI_EXPERIMENTAL=enabled
-set +e
-docker buildx rm namelessmc_builder
-set -e
-docker buildx create --use --name namelessmc_builder
 docker buildx build -t namelessmc/nginx --platform=linux/arm,linux/arm64,linux/amd64 nginx_web --push
 docker buildx build -t namelessmc/php --platform=linux/arm,linux/arm64,linux/amd64 php_fpm --push
-docker buildx rm namelessmc_builder
+docker buildx build -t namelessmc/php:dev --build-arg VERSION=v2 --platform=linux/arm,linux/arm64,linux/amd64 php_fpm --push
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index 2abb519..2451d5f 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -1,7 +1,5 @@
 FROM php:7.4-fpm
 
-ARG NAMELESSMC_VERSION=2.0.0-pr7
-
 RUN docker-php-source extract && \
     BUILD_DEPS="libmcrypt-dev libldap2-dev libjpeg62-turbo-dev libfreetype6-dev libpng-dev" && \
     apt-get update && \
@@ -15,6 +13,7 @@ RUN docker-php-source extract && \
 
 ADD entrypoint.sh /
 
-ENV NAMELESSMC_VERSION=2.0.0-pr7
+ARG VERSION=v2.0.0-pr7
+ENV VERSION=${VERSION}
 
 ENTRYPOINT [ "bash", "/entrypoint.sh" ]
diff --git a/php_fpm/entrypoint.sh b/php_fpm/entrypoint.sh
index 2f24445..66dab7d 100644
--- a/php_fpm/entrypoint.sh
+++ b/php_fpm/entrypoint.sh
@@ -9,9 +9,9 @@ else
     set -x
     mkdir -p /data
     cd /tmp
-    curl -Lo nameless.tar.gz https://github.com/NamelessMC/Nameless/archive/v$NAMELESSMC_VERSION.tar.gz
-    tar -xf nameless.tar.gz
-    mv Nameless-$NAMELESSMC_VERSION/{,.[^.]}* /data
+    curl -Lo "nameless.tar.gz" "https://github.com/NamelessMC/Nameless/archive/${VERSION}.tar.gz"
+    tar -xf "nameless.tar.gz"
+    mv Nameless-*/{,.[^.]}* "/data"
     chown -R www-data:www-data /data
     chmod 755 -R /data
     rm -rf /tmp