update to v1.1.3

mik-p · May 9, 2021 · 6c6743c · 6c6743c
1 parent 3022d2b
commit 6c6743c
Show file tree

Hide file tree

Showing 21 changed files with 79 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Docker + Winter CMS
 
-[![Docker Hub Pulls](https://img.shields.io/docker/pulls/hiltonbanes/wintercms.svg)](https://hub.docker.com/r/hiltonbanes/wintercms/) [![Winter CMS Build v1.1.2](https://img.shields.io/badge/Winter%20CMS%20Build-v1.1.2-red.svg)](https://github.com/wintercms/winter)
+[![Docker Hub Pulls](https://img.shields.io/docker/pulls/hiltonbanes/wintercms.svg)](https://hub.docker.com/r/hiltonbanes/wintercms/) [![Winter CMS Build v1.1.3](https://img.shields.io/badge/Winter%20CMS%20Build-v1.1.3-red.svg)](https://github.com/wintercms/winter)
 
 The docker images defined in this repository serve as a starting point for [Winter CMS](https://wintercms.com) projects.
 
@@ -20,12 +20,12 @@ Based on [official docker PHP images](https://hub.docker.com/_/php), images incl
 
 ## Supported Tags
 
-- `build.v1.1.2-php7.4-apache`, `php7.4-apache`: [php7.4/apache/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.4/apache/Dockerfile)
-- `build.v1.1.2-php7.4-fpm`, `php7.4-fpm`: [php7.4/fpm/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.4/fpm/Dockerfile)
-- `build.v1.1.2-php7.3-apache`, `php7.3-apache`: [php7.3/apache/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.3/apache/Dockerfile)
-- `build.v1.1.2-php7.3-fpm`, `php7.3-fpm`: [php7.3/fpm/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.3/fpm/Dockerfile)
-- `build.v1.1.2-php7.2-apache`, `php7.2-apache`, `build.v1.1.2`, `latest`: [php7.2/apache/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.2/apache/Dockerfile)
-- `build.v1.1.2-php7.2-fpm`, `php7.2-fpm`: [php7.2/fpm/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.2/fpm/Dockerfile)
+- `build.v1.1.3-php7.4-apache`, `php7.4-apache`: [php7.4/apache/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.4/apache/Dockerfile)
+- `build.v1.1.3-php7.4-fpm`, `php7.4-fpm`: [php7.4/fpm/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.4/fpm/Dockerfile)
+- `build.v1.1.3-php7.3-apache`, `php7.3-apache`: [php7.3/apache/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.3/apache/Dockerfile)
+- `build.v1.1.3-php7.3-fpm`, `php7.3-fpm`: [php7.3/fpm/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.3/fpm/Dockerfile)
+- `build.v1.1.3-php7.2-apache`, `php7.2-apache`, `build.v1.1.3`, `latest`: [php7.2/apache/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.2/apache/Dockerfile)
+- `build.v1.1.3-php7.2-fpm`, `php7.2-fpm`: [php7.2/fpm/Dockerfile](https://github.com/mik-p/docker-wintercms/blob/master/php7.2/fpm/Dockerfile)
 
 
 ### Develop Tags

diff --git a/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile
@@ -33,9 +33,9 @@ RUN a2enmod rewrite
 
 COPY config/docker /usr/src/wintercms-config-docker
 
-ENV WINTERCMS_TAG v1.1.2
-ENV WINTERCMS_CHECKSUM 20279a25a0353b6ad15564682a3b202139624f81
-ENV WINTERCMS_CORE_BUILD v1.1.2
+ENV WINTERCMS_TAG v1.1.3
+ENV WINTERCMS_CHECKSUM 2de7aea6dd136da6a0723198c52c3342083176f4
+ENV WINTERCMS_CORE_BUILD v1.1.3
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG --depth 1 . && \
   echo "Update composer.json: Set explicit build references for winter module dependencies" && \

diff --git a/php7.2/apache/Dockerfile.develop b/php7.2/apache/Dockerfile.develop
@@ -43,8 +43,8 @@ RUN a2enmod rewrite
 COPY config/docker /usr/src/wintercms-config-docker
 
 ENV WINTERCMS_TAG develop
-ENV WINTERCMS_DEVELOP_CHECKSUM 43f6844bf1357ee6dec75be0b74cf6b785a37f70
-ENV WINTERCMS_DEVELOP_COMMIT c04ea9e104d98cfd7d4faaa34f21c29b5e83ee7c
+ENV WINTERCMS_DEVELOP_CHECKSUM 59090f063b84e5e44a9fd0830c392058d9bb060d
+ENV WINTERCMS_DEVELOP_COMMIT 203d2c4ebac696d39d3dbd92137077db3fb82978
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG . && \
   composer install --no-interaction --prefer-dist --no-scripts && \

diff --git a/php7.2/apache/docker-wn-entrypoint b/php7.2/apache/docker-wn-entrypoint
@@ -124,11 +124,11 @@ fi
 if [ "${INIT_WINTER,,}" == "true" ]; then
   echo 'Initializing Winter CMS...'
   php artisan winter:up
-  
-  # newer versions of winter generate random passwords for admin 
+
+  # newer versions of winter generate random passwords for admin
   # if the environment option for admin password is set then change it here
   if [ ! -z "$CMS_ADMIN_PASSWORD" ]; then
-      echo 'Update Winter CMS admin password...'
+    echo 'Update Winter CMS admin password...'
 	  php artisan winter:passwd admin $CMS_ADMIN_PASSWORD
   fi
 fi

diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile
@@ -33,9 +33,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/l
 
 COPY config/docker /usr/src/wintercms-config-docker
 
-ENV WINTERCMS_TAG v1.1.2
-ENV WINTERCMS_CHECKSUM 20279a25a0353b6ad15564682a3b202139624f81
-ENV WINTERCMS_CORE_BUILD v1.1.2
+ENV WINTERCMS_TAG v1.1.3
+ENV WINTERCMS_CHECKSUM 2de7aea6dd136da6a0723198c52c3342083176f4
+ENV WINTERCMS_CORE_BUILD v1.1.3
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG --depth 1 . && \
   echo "Update composer.json: Set explicit build references for winter module dependencies" && \

diff --git a/php7.2/fpm/Dockerfile.develop b/php7.2/fpm/Dockerfile.develop
@@ -43,8 +43,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/l
 COPY config/docker /usr/src/wintercms-config-docker
 
 ENV WINTERCMS_TAG develop
-ENV WINTERCMS_DEVELOP_CHECKSUM 43f6844bf1357ee6dec75be0b74cf6b785a37f70
-ENV WINTERCMS_DEVELOP_COMMIT c04ea9e104d98cfd7d4faaa34f21c29b5e83ee7c
+ENV WINTERCMS_DEVELOP_CHECKSUM 59090f063b84e5e44a9fd0830c392058d9bb060d
+ENV WINTERCMS_DEVELOP_COMMIT 203d2c4ebac696d39d3dbd92137077db3fb82978
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG . && \
   composer install --no-interaction --prefer-dist --no-scripts && \

diff --git a/php7.2/fpm/docker-wn-entrypoint b/php7.2/fpm/docker-wn-entrypoint
@@ -124,11 +124,11 @@ fi
 if [ "${INIT_WINTER,,}" == "true" ]; then
   echo 'Initializing Winter CMS...'
   php artisan winter:up
-  
-  # newer versions of winter generate random passwords for admin 
+
+  # newer versions of winter generate random passwords for admin
   # if the environment option for admin password is set then change it here
   if [ ! -z "$CMS_ADMIN_PASSWORD" ]; then
-      echo 'Update Winter CMS admin password...'
+    echo 'Update Winter CMS admin password...'
 	  php artisan winter:passwd admin $CMS_ADMIN_PASSWORD
   fi
 fi

diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile
@@ -33,9 +33,9 @@ RUN a2enmod rewrite
 
 COPY config/docker /usr/src/wintercms-config-docker
 
-ENV WINTERCMS_TAG v1.1.2
-ENV WINTERCMS_CHECKSUM 20279a25a0353b6ad15564682a3b202139624f81
-ENV WINTERCMS_CORE_BUILD v1.1.2
+ENV WINTERCMS_TAG v1.1.3
+ENV WINTERCMS_CHECKSUM 2de7aea6dd136da6a0723198c52c3342083176f4
+ENV WINTERCMS_CORE_BUILD v1.1.3
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG --depth 1 . && \
   echo "Update composer.json: Set explicit build references for winter module dependencies" && \

diff --git a/php7.3/apache/Dockerfile.develop b/php7.3/apache/Dockerfile.develop
@@ -43,8 +43,8 @@ RUN a2enmod rewrite
 COPY config/docker /usr/src/wintercms-config-docker
 
 ENV WINTERCMS_TAG develop
-ENV WINTERCMS_DEVELOP_CHECKSUM 43f6844bf1357ee6dec75be0b74cf6b785a37f70
-ENV WINTERCMS_DEVELOP_COMMIT c04ea9e104d98cfd7d4faaa34f21c29b5e83ee7c
+ENV WINTERCMS_DEVELOP_CHECKSUM 59090f063b84e5e44a9fd0830c392058d9bb060d
+ENV WINTERCMS_DEVELOP_COMMIT 203d2c4ebac696d39d3dbd92137077db3fb82978
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG . && \
   composer install --no-interaction --prefer-dist --no-scripts && \

diff --git a/php7.3/apache/docker-wn-entrypoint b/php7.3/apache/docker-wn-entrypoint
@@ -124,11 +124,11 @@ fi
 if [ "${INIT_WINTER,,}" == "true" ]; then
   echo 'Initializing Winter CMS...'
   php artisan winter:up
-  
-  # newer versions of winter generate random passwords for admin 
+
+  # newer versions of winter generate random passwords for admin
   # if the environment option for admin password is set then change it here
   if [ ! -z "$CMS_ADMIN_PASSWORD" ]; then
-      echo 'Update Winter CMS admin password...'
+    echo 'Update Winter CMS admin password...'
 	  php artisan winter:passwd admin $CMS_ADMIN_PASSWORD
   fi
 fi

diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile
@@ -33,9 +33,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/l
 
 COPY config/docker /usr/src/wintercms-config-docker
 
-ENV WINTERCMS_TAG v1.1.2
-ENV WINTERCMS_CHECKSUM 20279a25a0353b6ad15564682a3b202139624f81
-ENV WINTERCMS_CORE_BUILD v1.1.2
+ENV WINTERCMS_TAG v1.1.3
+ENV WINTERCMS_CHECKSUM 2de7aea6dd136da6a0723198c52c3342083176f4
+ENV WINTERCMS_CORE_BUILD v1.1.3
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG --depth 1 . && \
   echo "Update composer.json: Set explicit build references for winter module dependencies" && \

diff --git a/php7.3/fpm/Dockerfile.develop b/php7.3/fpm/Dockerfile.develop
@@ -43,8 +43,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/l
 COPY config/docker /usr/src/wintercms-config-docker
 
 ENV WINTERCMS_TAG develop
-ENV WINTERCMS_DEVELOP_CHECKSUM 43f6844bf1357ee6dec75be0b74cf6b785a37f70
-ENV WINTERCMS_DEVELOP_COMMIT c04ea9e104d98cfd7d4faaa34f21c29b5e83ee7c
+ENV WINTERCMS_DEVELOP_CHECKSUM 59090f063b84e5e44a9fd0830c392058d9bb060d
+ENV WINTERCMS_DEVELOP_COMMIT 203d2c4ebac696d39d3dbd92137077db3fb82978
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG . && \
   composer install --no-interaction --prefer-dist --no-scripts && \

diff --git a/php7.3/fpm/docker-wn-entrypoint b/php7.3/fpm/docker-wn-entrypoint
@@ -124,11 +124,11 @@ fi
 if [ "${INIT_WINTER,,}" == "true" ]; then
   echo 'Initializing Winter CMS...'
   php artisan winter:up
-  
-  # newer versions of winter generate random passwords for admin 
+
+  # newer versions of winter generate random passwords for admin
   # if the environment option for admin password is set then change it here
   if [ ! -z "$CMS_ADMIN_PASSWORD" ]; then
-      echo 'Update Winter CMS admin password...'
+    echo 'Update Winter CMS admin password...'
 	  php artisan winter:passwd admin $CMS_ADMIN_PASSWORD
   fi
 fi

diff --git a/php7.4/apache/Dockerfile b/php7.4/apache/Dockerfile
@@ -33,9 +33,9 @@ RUN a2enmod rewrite
 
 COPY config/docker /usr/src/wintercms-config-docker
 
-ENV WINTERCMS_TAG v1.1.2
-ENV WINTERCMS_CHECKSUM 20279a25a0353b6ad15564682a3b202139624f81
-ENV WINTERCMS_CORE_BUILD v1.1.2
+ENV WINTERCMS_TAG v1.1.3
+ENV WINTERCMS_CHECKSUM 2de7aea6dd136da6a0723198c52c3342083176f4
+ENV WINTERCMS_CORE_BUILD v1.1.3
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG --depth 1 . && \
   echo "Update composer.json: Set explicit build references for winter module dependencies" && \

diff --git a/php7.4/apache/Dockerfile.develop b/php7.4/apache/Dockerfile.develop
@@ -43,8 +43,8 @@ RUN a2enmod rewrite
 COPY config/docker /usr/src/wintercms-config-docker
 
 ENV WINTERCMS_TAG develop
-ENV WINTERCMS_DEVELOP_CHECKSUM 43f6844bf1357ee6dec75be0b74cf6b785a37f70
-ENV WINTERCMS_DEVELOP_COMMIT c04ea9e104d98cfd7d4faaa34f21c29b5e83ee7c
+ENV WINTERCMS_DEVELOP_CHECKSUM 59090f063b84e5e44a9fd0830c392058d9bb060d
+ENV WINTERCMS_DEVELOP_COMMIT 203d2c4ebac696d39d3dbd92137077db3fb82978
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG . && \
   composer install --no-interaction --prefer-dist --no-scripts && \

diff --git a/php7.4/apache/docker-wn-entrypoint b/php7.4/apache/docker-wn-entrypoint
@@ -124,11 +124,11 @@ fi
 if [ "${INIT_WINTER,,}" == "true" ]; then
   echo 'Initializing Winter CMS...'
   php artisan winter:up
-  
-  # newer versions of winter generate random passwords for admin 
+
+  # newer versions of winter generate random passwords for admin
   # if the environment option for admin password is set then change it here
   if [ ! -z "$CMS_ADMIN_PASSWORD" ]; then
-      echo 'Update Winter CMS admin password...'
+    echo 'Update Winter CMS admin password...'
 	  php artisan winter:passwd admin $CMS_ADMIN_PASSWORD
   fi
 fi

diff --git a/php7.4/fpm/Dockerfile b/php7.4/fpm/Dockerfile
@@ -33,9 +33,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/l
 
 COPY config/docker /usr/src/wintercms-config-docker
 
-ENV WINTERCMS_TAG v1.1.2
-ENV WINTERCMS_CHECKSUM 20279a25a0353b6ad15564682a3b202139624f81
-ENV WINTERCMS_CORE_BUILD v1.1.2
+ENV WINTERCMS_TAG v1.1.3
+ENV WINTERCMS_CHECKSUM 2de7aea6dd136da6a0723198c52c3342083176f4
+ENV WINTERCMS_CORE_BUILD v1.1.3
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG --depth 1 . && \
   echo "Update composer.json: Set explicit build references for winter module dependencies" && \

diff --git a/php7.4/fpm/Dockerfile.develop b/php7.4/fpm/Dockerfile.develop
@@ -43,8 +43,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/l
 COPY config/docker /usr/src/wintercms-config-docker
 
 ENV WINTERCMS_TAG develop
-ENV WINTERCMS_DEVELOP_CHECKSUM 43f6844bf1357ee6dec75be0b74cf6b785a37f70
-ENV WINTERCMS_DEVELOP_COMMIT c04ea9e104d98cfd7d4faaa34f21c29b5e83ee7c
+ENV WINTERCMS_DEVELOP_CHECKSUM 59090f063b84e5e44a9fd0830c392058d9bb060d
+ENV WINTERCMS_DEVELOP_COMMIT 203d2c4ebac696d39d3dbd92137077db3fb82978
 
 RUN git clone https://github.com/wintercms/winter.git -b $WINTERCMS_TAG . && \
   composer install --no-interaction --prefer-dist --no-scripts && \

diff --git a/php7.4/fpm/docker-wn-entrypoint b/php7.4/fpm/docker-wn-entrypoint
@@ -124,11 +124,11 @@ fi
 if [ "${INIT_WINTER,,}" == "true" ]; then
   echo 'Initializing Winter CMS...'
   php artisan winter:up
-  
-  # newer versions of winter generate random passwords for admin 
+
+  # newer versions of winter generate random passwords for admin
   # if the environment option for admin password is set then change it here
   if [ ! -z "$CMS_ADMIN_PASSWORD" ]; then
-      echo 'Update Winter CMS admin password...'
+    echo 'Update Winter CMS admin password...'
 	  php artisan winter:passwd admin $CMS_ADMIN_PASSWORD
   fi
 fi

diff --git a/update.sh b/update.sh
@@ -41,6 +41,25 @@ function update_checksum {
   rm $ARCHIVE
 }
 
+function update_checksum_for_commit {
+  if [ -z "$1" ]; then
+    echo "Error: Invalid slug. Aborting..." && exit 1;
+  else
+    local SLUG=$1;
+  fi
+
+  local ARCHIVE="wintercms-$SLUG.tar.gz"
+  curl -o $ARCHIVE -fS#L --connect-timeout 15 https://github.com/wintercms/winter/archive/$SLUG.tar.gz || exit 1;
+  if hash sha1sum 2>&-; then
+    sha1sum $ARCHIVE | awk '{print $1}'
+  elif hash openssl 2>&-; then
+    openssl sha1 $ARCHIVE | awk '{print $2}'
+  else
+    echo "Error: Could not generate checksum. Aborting" && exit 1;
+  fi
+  rm $ARCHIVE
+}
+
 function update_dockerfiles {
 
   local current_tag="$STABLE_BUILD"
@@ -262,7 +281,7 @@ if [ "$GITHUB_LATEST_COMMIT" != "$WINTERCMS_DEVELOP_COMMIT" ]; then
   echo "    New DEVELOP commit";
   echo "     SHA: $GITHUB_LATEST_COMMIT"
   echo " - Generating develop checksum..."
-  GITHUB_LATEST_CHECKSUM=$(update_checksum $GITHUB_LATEST_COMMIT)
+  GITHUB_LATEST_CHECKSUM=$(update_checksum_for_commit $GITHUB_LATEST_COMMIT)
 else
   DEVELOP_UPDATE=0
   GITHUB_LATEST_CHECKSUM=$WINTERCMS_DEVELOP_CHECKSUM

diff --git a/version b/version
@@ -1,4 +1,4 @@
-WINTERCMS_BUILD=v1.1.2
-WINTERCMS_CHECKSUM=20279a25a0353b6ad15564682a3b202139624f81
-WINTERCMS_DEVELOP_COMMIT=c04ea9e104d98cfd7d4faaa34f21c29b5e83ee7c
-WINTERCMS_DEVELOP_CHECKSUM=43f6844bf1357ee6dec75be0b74cf6b785a37f70
+WINTERCMS_BUILD=v1.1.3
+WINTERCMS_CHECKSUM=2de7aea6dd136da6a0723198c52c3342083176f4
+WINTERCMS_DEVELOP_COMMIT=203d2c4ebac696d39d3dbd92137077db3fb82978
+WINTERCMS_DEVELOP_CHECKSUM=59090f063b84e5e44a9fd0830c392058d9bb060d