refactored build; use only php-nginx image

a6daa981 · Tobias Munk · 21114f48 · a6daa981 · a6daa981 · a6daa981
Commit a6daa981 authored Nov 20, 2016 by Tobias Munk
Showing with 39 additions and 55 deletions

.gitlab-ci.yml .gitlab-ci.yml +0 -1

Dockerfile Dockerfile +2 -2

composer.lock composer.lock +33 -33

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

docker-compose.yml docker-compose.yml +3 -13

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,4 +49,3 @@ cleanup:
    - docker-compose kill
    - docker-compose rm -fv --all
    - docker-compose down --remove-orphans --rmi local
-
--- a/Dockerfile
+++ b/Dockerfile
-FROM dmstr/php-yii2
+FROM dmstr/php-yii2:7.1-fpm-3.0-beta2-alpine-nginx

 WORKDIR /app

@@ -13,4 +13,4 @@ RUN cp src/app.env-dist src/app.env

 RUN mkdir -p runtime web/assets && \
    chmod -R 775 runtime web/assets && \
-    chown -R 1000:33 runtime web/assets
+    chown -R 82:33 runtime web/assets
--- a/composer.lock
+++ b/composer.lock
@@ -4,25 +4,25 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "542c7f22cf548afbc81c49633ccd06b4",
-    "content-hash": "719e1ba15b39ad0f2f4b83a299036401",
+    "hash": "55239f231b032f93c9db90672af4335b",
+    "content-hash": "f2dc05f3e5c0d89137074f1013eff2bd",
    "packages": [
        {
            "name": "bower-asset/bootstrap",
-            "version": "v3.3.5",
+            "version": "v3.3.7",
            "source": {
                "type": "git",
                "url": "https://github.com/twbs/bootstrap.git",
-                "reference": "16b48259a62f576e52c903c476bd42b90ab22482"
+                "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/16b48259a62f576e52c903c476bd42b90ab22482",
-                "reference": "16b48259a62f576e52c903c476bd42b90ab22482",
+                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/0b9c4a4007c44201dce9a6cc1a38407005c26c86",
+                "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86",
                "shasum": ""
            },
            "require": {
-                "bower-asset/jquery": ">=1.9.1"
+                "bower-asset/jquery": ">=1.9.1,<4.0"
            },
            "type": "bower-asset-library",
            "extra": {
@@ -58,16 +58,16 @@
        },
        {
            "name": "bower-asset/jquery",
-            "version": "2.2.3",
+            "version": "2.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/jquery/jquery-dist.git",
-                "reference": "af22a351b2ea5801ffb1695abb3bb34d5bed9198"
+                "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/af22a351b2ea5801ffb1695abb3bb34d5bed9198",
-                "reference": "af22a351b2ea5801ffb1695abb3bb34d5bed9198",
+                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/c0185ab7c75aab88762c5aae780b9d83b80eda72",
+                "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72",
                "shasum": ""
            },
            "type": "bower-asset-library",
@@ -197,16 +197,16 @@
        },
        {
            "name": "cebe/markdown",
-            "version": "1.1.0",
+            "version": "1.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/cebe/markdown.git",
-                "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2"
+                "reference": "c30eb5e01fe021cc5bba2f9ee0eeef96d4931166"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/cebe/markdown/zipball/54a2c49de31cc44e864ebf0500a35ef21d0010b2",
-                "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2",
+                "url": "https://api.github.com/repos/cebe/markdown/zipball/c30eb5e01fe021cc5bba2f9ee0eeef96d4931166",
+                "reference": "c30eb5e01fe021cc5bba2f9ee0eeef96d4931166",
                "shasum": ""
            },
            "require": {
@@ -253,7 +253,7 @@
                "markdown",
                "markdown-extra"
            ],
-            "time": "2015-03-06 05:28:07"
+            "time": "2016-09-14 20:40:20"
        },
        {
            "name": "codemix/yii2-streamlog",
@@ -296,16 +296,16 @@
        },
        {
            "name": "ezyang/htmlpurifier",
-            "version": "v4.7.0",
+            "version": "v4.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "ae1828d955112356f7677c465f94f7deb7d27a40"
+                "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40",
-                "reference": "ae1828d955112356f7677c465f94f7deb7d27a40",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
+                "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
                "shasum": ""
            },
            "require": {
@@ -336,20 +336,20 @@
            "keywords": [
                "html"
            ],
-            "time": "2015-08-05 01:03:42"
+            "time": "2016-07-16 12:58:58"
        },
        {
            "name": "vlucas/phpdotenv",
-            "version": "v2.2.1",
+            "version": "v2.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "63f37b9395e8041cd4313129c08ece896d06ca8e"
+                "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/63f37b9395e8041cd4313129c08ece896d06ca8e",
-                "reference": "63f37b9395e8041cd4313129c08ece896d06ca8e",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+                "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
                "shasum": ""
            },
            "require": {
@@ -361,7 +361,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -386,24 +386,24 @@
                "env",
                "environment"
            ],
-            "time": "2016-04-15 10:48:49"
+            "time": "2016-09-01 10:05:43"
        },
        {
            "name": "yiisoft/yii2",
-            "version": "2.0.8",
+            "version": "2.0.10",
            "source": {
                "type": "git",
                "url": "https://github.com/yiisoft/yii2-framework.git",
-                "reference": "53992b136b993e32ca7b6f399cf42b143f8685a6"
+                "reference": "5bfcb7a6dfa9771e2248eb8c4448613330f343ff"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/53992b136b993e32ca7b6f399cf42b143f8685a6",
-                "reference": "53992b136b993e32ca7b6f399cf42b143f8685a6",
+                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/5bfcb7a6dfa9771e2248eb8c4448613330f343ff",
+                "reference": "5bfcb7a6dfa9771e2248eb8c4448613330f343ff",
                "shasum": ""
            },
            "require": {
-                "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable",
+                "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
                "bower-asset/jquery.inputmask": "~3.2.2",
                "bower-asset/punycode": "1.3.*",
                "bower-asset/yii2-pjax": "~2.0.1",
@@ -480,7 +480,7 @@
                "framework",
                "yii2"
            ],
-            "time": "2016-04-28 14:50:20"
+            "time": "2016-10-20 12:02:50"
        },
        {
            "name": "yiisoft/yii2-bootstrap",

--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
 version: '2'
 services:
-  web:
-    volumes:
-      - ./web:/app/web
  php:
    build:
      dockerfile: Dockerfile
      context: .
-      args:
-        - GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
    environment:
-      - PHP_USER_ID=1000
+      - PHP_USER_ID=82
      - GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
    volumes:
      - ./composer.json:/app/composer.json

--- a/docker-compose.yml
+++ b/docker-compose.yml
 version: '2'
 services:
-    web:
-        image: phundament/nginx-one:1.9-5.1.1
-        environment:
-          - FASTCGI_PASS_HOST=php
-        depends_on:
-          - php
-        volumes_from:
-          - php
-        ports:
-          - 80
    php:
-        image: ${STACK_PHP_IMAGE}
-        volumes:
-            - /app/web
+        build: .
+        ports:
+          - 20080:80