From 958b39e9be73f84e1caba7363c058eec23612cbb Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Wed, 27 Jul 2022 12:13:34 +0200
Subject: [PATCH] Deploy fixes

---
 Dockerfile | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ebeec8f0..7a153ce0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,14 +3,15 @@ FROM debian:stretch-slim
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-# NodeJs
-
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
-    && apt install -y --no-install-recommends nodejs
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        ca-certificates \
+        gnupg2
 
 # Apache
 
-RUN apt install -y --no-install-recommends \
+RUN apt-get install -y --no-install-recommends \
         apache2 \
         libapache2-mod-php \
     && . /etc/apache2/envvars \
@@ -20,18 +21,19 @@ RUN apt install -y --no-install-recommends \
 
 RUN a2dissite 000-default
 
+# NodeJs
+
+RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs
+
 # Hedera
 
-RUN apt install -y --no-install-recommends \
-        curl \
-        ca-certificates \
-        gnupg2 \
-    && curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
+RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
     && echo "deb http://apt.verdnatura.es/ jessie main" \
         > /etc/apt/sources.list.d/vn.list \
-    && apt update
+    && apt-get update
 
-RUN apt install -y --no-install-recommends \
+RUN apt-get install -y --no-install-recommends \
         php-image-text \
         php-text-captcha \
         php-apcu \
@@ -44,8 +46,8 @@ ARG VERSION
 ENV VERSION $VERSION
 RUN echo $VERSION
 
-RUN apt update \
-    && apt install -y php-vn-lib hedera-web=$VERSION \
+RUN apt-get update \
+    && apt-get install -y php-vn-lib hedera-web=$VERSION \
     && rm -rf /var/lib/apt/lists/*
 
 CMD ["apachectl", "-D", "FOREGROUND"]