From 5cfd158a720f0ccb843407c8f4b4cb3b92f23d39 Mon Sep 17 00:00:00 2001 From: Vinayak Kulkarni Date: Mon, 27 Apr 2020 01:38:22 +0530 Subject: [PATCH 1/4] chore: upgrade Ubuntu 20.04 --- docker-files/docker/app/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-files/docker/app/Dockerfile b/docker-files/docker/app/Dockerfile index c58550b..c4926b4 100644 --- a/docker-files/docker/app/Dockerfile +++ b/docker-files/docker/app/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="Chris Fidao" From ad0bc63346c6701808215645a0f5b1867dcb3a3f Mon Sep 17 00:00:00 2001 From: Vinayak Kulkarni Date: Mon, 27 Apr 2020 02:42:07 +0530 Subject: [PATCH 2/4] chore: update nginx & php repo links --- docker-files/docker/app/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-files/docker/app/Dockerfile b/docker-files/docker/app/Dockerfile index c4926b4..1306909 100644 --- a/docker-files/docker/app/Dockerfile +++ b/docker-files/docker/app/Dockerfile @@ -14,8 +14,8 @@ RUN set -x \ RUN mkdir ~/.gnupg \ && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ - && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ - && echo "deb http://ppa.launchpad.net/nginx/development/ubuntu bionic main" > /etc/apt/sources.list.d/ppa_nginx_mainline.list \ + && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ + && echo "deb http://ppa.launchpad.net/nginx/development/ubuntu focal main" > /etc/apt/sources.list.d/ppa_nginx_mainline.list \ && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E5267A6C \ && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \ && apt-get update \ From f9447d4854d5f7c83253d233889713de732661ce Mon Sep 17 00:00:00 2001 From: Vinayak Kulkarni Date: Wed, 20 May 2020 01:02:22 +0530 Subject: [PATCH 3/4] feat: use nginx ppa instead of launchpad --- docker-files/docker/app/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker-files/docker/app/Dockerfile b/docker-files/docker/app/Dockerfile index 1306909..41f8696 100644 --- a/docker-files/docker/app/Dockerfile +++ b/docker-files/docker/app/Dockerfile @@ -15,11 +15,14 @@ RUN set -x \ RUN mkdir ~/.gnupg \ && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ - && echo "deb http://ppa.launchpad.net/nginx/development/ubuntu focal main" > /etc/apt/sources.list.d/ppa_nginx_mainline.list \ + && apt-get install curl gnupg2 ca-certificates lsb-release -y \ + && echo "deb http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" | tee /etc/apt/sources.list.d/nginx.list \ + && curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-key fingerprint ABF5BD827BD9BF62 \ && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E5267A6C \ && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \ && apt-get update \ - && apt-get install -y curl zip unzip git supervisor sqlite3 \ + && apt-get install -y zip unzip git supervisor sqlite3 \ && apt-get install -y nginx php7.4-fpm php7.4-cli \ php7.4-pgsql php7.4-sqlite3 php7.4-gd \ php7.4-curl php7.4-memcached \ From 46cbf478fd331d9d95caefc82af37599c714e9de Mon Sep 17 00:00:00 2001 From: Vinayak Kulkarni Date: Wed, 20 May 2020 01:16:01 +0530 Subject: [PATCH 4/4] chore: update ordering for better readability --- docker-files/docker/app/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docker-files/docker/app/Dockerfile b/docker-files/docker/app/Dockerfile index 41f8696..6011ca6 100644 --- a/docker-files/docker/app/Dockerfile +++ b/docker-files/docker/app/Dockerfile @@ -14,15 +14,14 @@ RUN set -x \ RUN mkdir ~/.gnupg \ && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ - && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ - && apt-get install curl gnupg2 ca-certificates lsb-release -y \ + && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E5267A6C \ + && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \ + && apt-get install curl gnupg2 ca-certificates lsb-release zip unzip git supervisor sqlite3 -y \ + && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ && echo "deb http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" | tee /etc/apt/sources.list.d/nginx.list \ && curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-key fingerprint ABF5BD827BD9BF62 \ - && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E5267A6C \ - && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \ && apt-get update \ - && apt-get install -y zip unzip git supervisor sqlite3 \ && apt-get install -y nginx php7.4-fpm php7.4-cli \ php7.4-pgsql php7.4-sqlite3 php7.4-gd \ php7.4-curl php7.4-memcached \