From fab87c1577e5532c15d999eff9df76dc454ef482 Mon Sep 17 00:00:00 2001
From: Aleksander Cynarski <aleksander@cynarski.pl>
Date: Sat, 3 Jul 2021 14:07:59 +0200
Subject: [PATCH] php 7.2 vuluns

---
 .drone.yml | 96 +++++++++++++++++++++++++++---------------------------
 Dockerfile |  4 +--
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 321eca5..616fd30 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,22 +2,22 @@ kind: pipeline
 name: default
 
 steps:
-- name: php8.0 
-  image: plugins/docker
-  settings:
-    username: 
-      from_secret: hub_username
-    password: 
-      from_secret: hub_password
-    repo: 
-      from_secret: hub_repo
-    build_args:
-      - PHP_VERSION=8.0-fpm-alpine3.13
-    tags: 8.0-alpine
-  when: 
-    branch:
-      - master
-  depends_on: [ clone ]
+# - name: php8.0 
+#   image: plugins/docker
+#   settings:
+#     username: 
+#       from_secret: hub_username
+#     password: 
+#       from_secret: hub_password
+#     repo: 
+#       from_secret: hub_repo
+#     build_args:
+#       - PHP_VERSION=8.0-fpm-alpine3.13
+#     tags: 8.0-alpine
+#   when: 
+#     branch:
+#       - master
+#   depends_on: [ clone ]
 
 # - name: php8.0-dev
 #   image: plugins/docker
@@ -37,22 +37,22 @@ steps:
 #       - master
 #   depends_on: [ clone ]
 
-- name: php7.4  
-  image: plugins/docker
-  settings:
-    username: 
-      from_secret: hub_username
-    password: 
-      from_secret: hub_password
-    repo: 
-      from_secret: hub_repo
-    build_args:
-      - PHP_VERSION=7.4-fpm-alpine3.13
-    tags: 7.4-alpine
-  when: 
-    branch:
-      - master
-  depends_on: [ clone ]
+# - name: php7.4  
+#   image: plugins/docker
+#   settings:
+#     username: 
+#       from_secret: hub_username
+#     password: 
+#       from_secret: hub_password
+#     repo: 
+#       from_secret: hub_repo
+#     build_args:
+#       - PHP_VERSION=7.4-fpm-alpine3.13
+#     tags: 7.4-alpine
+#   when: 
+#     branch:
+#       - master
+#   depends_on: [ clone ]
 
 # - name: php7.4-dev
 #   image: plugins/docker
@@ -72,22 +72,22 @@ steps:
 #       - master
 #   depends_on: [ clone ]
 
-- name: php7.3
-  image: plugins/docker
-  settings:
-    username: 
-      from_secret: hub_username
-    password: 
-      from_secret: hub_password
-    repo: 
-      from_secret: hub_repo
-    build_args:
-      - PHP_VERSION=7.3-fpm-alpine3.13
-    tags: 7.3-alpine
-  when: 
-    branch:
-      - master
-  depends_on: [ clone ]
+# - name: php7.3
+#   image: plugins/docker
+#   settings:
+#     username: 
+#       from_secret: hub_username
+#     password: 
+#       from_secret: hub_password
+#     repo: 
+#       from_secret: hub_repo
+#     build_args:
+#       - PHP_VERSION=7.3-fpm-alpine3.13
+#     tags: 7.3-alpine
+#   when: 
+#     branch:
+#       - master
+#   depends_on: [ clone ]
 
 # - name: php7.3-dev
 #   image: plugins/docker
diff --git a/Dockerfile b/Dockerfile
index c349356..fd423ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,8 +53,8 @@ ARG ENVIRONMENT=production
 # install system libs
 RUN apk update && apk add --no-cache libintl c-client libpng icu-libs libldap libpq libjpeg freetype libzip shadow sudo wget bash git openssh supervisor nginx openssl zip
 
-# update curl (CVE-2021-22901)
-RUN apk del curl && apk add curl
+# force apk upgrade, clear apk cache
+RUN apk upgrade && rm -rf /var/cache/apk/*
 
 ENV DIR /var/www
 ENV DOCKERIZE_VERSION v0.6.1