Browse Source

Fixed typo in last build image

Mark Shust 5 năm trước cách đây
mục cha
commit
939364bd3a
5 tập tin đã thay đổi với 12 bổ sung6 xóa
  1. 5 0
      CHANGELOG.md
  2. 3 2
      README.md
  3. 1 1
      compose/docker-compose.dev.yml
  4. 2 2
      compose/docker-compose.yml
  5. 1 1
      images/nginx/1.18/Dockerfile

+ 5 - 0
CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 N/A
 
+## [31.0.2] - 2020-04-30
+
+### Fixed
+- Fixed typo in last build image, new version is `magento-nginx:1.18-2`.
+
 ## [31.0.1] - 2020-04-30
 
 ### Fixed

+ 3 - 2
README.md

@@ -83,8 +83,9 @@ View Dockerfiles:
 
 - [markoshust/magento-nginx (Docker Hub)](https://hub.docker.com/r/markoshust/magento-nginx/)
   - 1.18
-      - [`latest`, `1.18`, `1.18-1`](https://github.com/markshust/docker-magento/tree/master/images/nginx/1.18)
-      - [`1.18`, `1.18-0`](https://github.com/markshust/docker-magento/tree/31.0.0/images/nginx/1.18)
+      - [`latest`, `1.18`, `1.18-2`](https://github.com/markshust/docker-magento/tree/master/images/nginx/1.18)
+      - [`1.18-1`](https://github.com/markshust/docker-magento/tree/31.0.1/images/nginx/1.18)
+      - [`1.18-0`](https://github.com/markshust/docker-magento/tree/31.0.0/images/nginx/1.18)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
   - 7.3
       - [`latest`, `7.3-fpm`, `7.3-fpm-6`](https://github.com/markshust/docker-magento/tree/master/images/php/7.3)

+ 1 - 1
compose/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 # Mark Shust's Docker Configuration for Magento
 # (https://github.com/markshust/docker-magento)
 #
-# Version 31.0.1
+# Version 31.0.2
 
 version: "3"
 

+ 2 - 2
compose/docker-compose.yml

@@ -1,13 +1,13 @@
 # Mark Shust's Docker Configuration for Magento
 # (https://github.com/markshust/docker-magento)
 #
-# Version 31.0.1
+# Version 31.0.2
 
 version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.18-1
+    image: markoshust/magento-nginx:1.18-2
     ports:
       - "80:8000"
       - "443:8443"

+ 1 - 1
images/nginx/1.18/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
   openssl
 
 RUN mkdir /etc/nginx/certs \
-  && echo -e "\n\n\n\n\n\n\n" | openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/certs/nginx.key -out /etc/nginx/certs/nginx.cr
+  && echo -e "\n\n\n\n\n\n\n" | openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/certs/nginx.key -out /etc/nginx/certs/nginx.crt
 
 RUN ( \
   cd /usr/local/bin/ \