Ubuntu package corrections

htmlgraphic · Feb 25, 2020 · a311102 · a311102
1 parent 2fddaca
commit a311102
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,10 +12,9 @@ ENV LANG=${OS_LOCALE} \
 RUN BUILD_DEPS='software-properties-common' \
     && dpkg-reconfigure locales \
         && apt-get install -y $BUILD_DEPS \
-        && add-apt-repository -y ppa:ondrej/php \
-        && add-apt-repository -y ppa:ondrej/apache2 \
-        && apt-get update \
-        && apt-get install -y curl apache2 libsasl2-modules libapache2-mod-php7.4 libmcrypt-dev php7.4-cli php7.4-dev php7.4-readline php7.4-mbstring php7.4-zip php7.4-intl php-xml php7.4-xml php7.4-xmlrpc php7.4-json php7.4-curl php7.4-gd php7.4-pgsql php7.4-mysql php-pear \
+        && add-apt-repository -y ppa:ondrej/php
+
+RUN apt-get update && apt-get install -y curl apache2 libsasl2-modules libapache2-mod-php7.4 libmcrypt-dev php7.4-cli php7.4-dev php7.4-readline php7.4-mbstring php7.4-zip php7.4-intl php7.4-xml php7.4-xmlrpc php7.4-json php7.4-curl php7.4-gd php7.4-pgsql php7.4-mysql php-pear \
     && apt-get update && apt-get install -yq --no-install-recommends \
         git \
         cron \

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ SHELL = /bin/sh
 
 include .env # .env file needs to created for this to work properly
 
-TAG 		= 1.8.3
+TAG 		= 1.8.4
 CONTAINER 	= apache
 IMAGE_REPO 	= htmlgraphic
 IMAGE_NAME 	= $(IMAGE_REPO)/$(CONTAINER)