Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
docker-yii2-app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dmstr
docker-yii2-app
Commits
a6daa981
Commit
a6daa981
authored
Nov 20, 2016
by
Tobias Munk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactored build; use only php-nginx image
parent
21114f48
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
55 deletions
+39
-55
.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.
.gitlab-ci.yml
View file @
a6daa981
...
@@ -49,4 +49,3 @@ cleanup:
...
@@ -49,4 +49,3 @@ cleanup:
-
docker-compose kill
-
docker-compose kill
-
docker-compose rm -fv --all
-
docker-compose rm -fv --all
-
docker-compose down --remove-orphans --rmi local
-
docker-compose down --remove-orphans --rmi local
Dockerfile
View file @
a6daa981
FROM
dmstr/php-yii2
FROM
dmstr/php-yii2
:7.1-fpm-3.0-beta2-alpine-nginx
WORKDIR
/app
WORKDIR
/app
...
@@ -13,4 +13,4 @@ RUN cp src/app.env-dist src/app.env
...
@@ -13,4 +13,4 @@ RUN cp src/app.env-dist src/app.env
RUN
mkdir
-p
runtime web/assets
&&
\
RUN
mkdir
-p
runtime web/assets
&&
\
chmod
-R
775 runtime web/assets
&&
\
chmod
-R
775 runtime web/assets
&&
\
chown
-R
1000
:33 runtime web/assets
chown
-R
82
:33 runtime web/assets
composer.lock
View file @
a6daa981
...
@@ -4,25 +4,25 @@
...
@@ -4,25 +4,25 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
"This file is @generated automatically"
],
],
"hash": "5
42c7f22cf548afbc81c49633ccd06b4
",
"hash": "5
5239f231b032f93c9db90672af4335b
",
"content-hash": "
719e1ba15b39ad0f2f4b83a299036401
",
"content-hash": "
f2dc05f3e5c0d89137074f1013eff2bd
",
"packages": [
"packages": [
{
{
"name": "bower-asset/bootstrap",
"name": "bower-asset/bootstrap",
"version": "v3.3.
5
",
"version": "v3.3.
7
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/twbs/bootstrap.git",
"url": "https://github.com/twbs/bootstrap.git",
"reference": "
16b48259a62f576e52c903c476bd42b90ab22482
"
"reference": "
0b9c4a4007c44201dce9a6cc1a38407005c26c86
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/
16b48259a62f576e52c903c476bd42b90ab22482
",
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/
0b9c4a4007c44201dce9a6cc1a38407005c26c86
",
"reference": "
16b48259a62f576e52c903c476bd42b90ab22482
",
"reference": "
0b9c4a4007c44201dce9a6cc1a38407005c26c86
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
"bower-asset/jquery": ">=1.9.1"
"bower-asset/jquery": ">=1.9.1
,<4.0
"
},
},
"type": "bower-asset-library",
"type": "bower-asset-library",
"extra": {
"extra": {
...
@@ -58,16 +58,16 @@
...
@@ -58,16 +58,16 @@
},
},
{
{
"name": "bower-asset/jquery",
"name": "bower-asset/jquery",
"version": "2.2.
3
",
"version": "2.2.
4
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/jquery/jquery-dist.git",
"url": "https://github.com/jquery/jquery-dist.git",
"reference": "
af22a351b2ea5801ffb1695abb3bb34d5bed9198
"
"reference": "
c0185ab7c75aab88762c5aae780b9d83b80eda72
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/jquery/jquery-dist/zipball/
af22a351b2ea5801ffb1695abb3bb34d5bed9198
",
"url": "https://api.github.com/repos/jquery/jquery-dist/zipball/
c0185ab7c75aab88762c5aae780b9d83b80eda72
",
"reference": "
af22a351b2ea5801ffb1695abb3bb34d5bed9198
",
"reference": "
c0185ab7c75aab88762c5aae780b9d83b80eda72
",
"shasum": ""
"shasum": ""
},
},
"type": "bower-asset-library",
"type": "bower-asset-library",
...
@@ -197,16 +197,16 @@
...
@@ -197,16 +197,16 @@
},
},
{
{
"name": "cebe/markdown",
"name": "cebe/markdown",
"version": "1.1.
0
",
"version": "1.1.
1
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/cebe/markdown.git",
"url": "https://github.com/cebe/markdown.git",
"reference": "
54a2c49de31cc44e864ebf0500a35ef21d0010b2
"
"reference": "
c30eb5e01fe021cc5bba2f9ee0eeef96d4931166
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/cebe/markdown/zipball/
54a2c49de31cc44e864ebf0500a35ef21d0010b2
",
"url": "https://api.github.com/repos/cebe/markdown/zipball/
c30eb5e01fe021cc5bba2f9ee0eeef96d4931166
",
"reference": "
54a2c49de31cc44e864ebf0500a35ef21d0010b2
",
"reference": "
c30eb5e01fe021cc5bba2f9ee0eeef96d4931166
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -253,7 +253,7 @@
...
@@ -253,7 +253,7 @@
"markdown",
"markdown",
"markdown-extra"
"markdown-extra"
],
],
"time": "201
5-03-06 05:28:07
"
"time": "201
6-09-14 20:40:20
"
},
},
{
{
"name": "codemix/yii2-streamlog",
"name": "codemix/yii2-streamlog",
...
@@ -296,16 +296,16 @@
...
@@ -296,16 +296,16 @@
},
},
{
{
"name": "ezyang/htmlpurifier",
"name": "ezyang/htmlpurifier",
"version": "v4.
7
.0",
"version": "v4.
8
.0",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/ezyang/htmlpurifier.git",
"url": "https://github.com/ezyang/htmlpurifier.git",
"reference": "
ae1828d955112356f7677c465f94f7deb7d27a40
"
"reference": "
d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/
ae1828d955112356f7677c465f94f7deb7d27a40
",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/
d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2
",
"reference": "
ae1828d955112356f7677c465f94f7deb7d27a40
",
"reference": "
d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -336,20 +336,20 @@
...
@@ -336,20 +336,20 @@
"keywords": [
"keywords": [
"html"
"html"
],
],
"time": "201
5-08-05 01:03:42
"
"time": "201
6-07-16 12:58:58
"
},
},
{
{
"name": "vlucas/phpdotenv",
"name": "vlucas/phpdotenv",
"version": "v2.
2.1
",
"version": "v2.
4.0
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "
63f37b9395e8041cd4313129c08ece896d06ca8e
"
"reference": "
3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/
63f37b9395e8041cd4313129c08ece896d06ca8e
",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/
3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c
",
"reference": "
63f37b9395e8041cd4313129c08ece896d06ca8e
",
"reference": "
3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -361,7 +361,7 @@
...
@@ -361,7 +361,7 @@
"type": "library",
"type": "library",
"extra": {
"extra": {
"branch-alias": {
"branch-alias": {
"dev-master": "2.
2
-dev"
"dev-master": "2.
4
-dev"
}
}
},
},
"autoload": {
"autoload": {
...
@@ -386,24 +386,24 @@
...
@@ -386,24 +386,24 @@
"env",
"env",
"environment"
"environment"
],
],
"time": "2016-0
4-15 10:48:49
"
"time": "2016-0
9-01 10:05:43
"
},
},
{
{
"name": "yiisoft/yii2",
"name": "yiisoft/yii2",
"version": "2.0.
8
",
"version": "2.0.
10
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/yiisoft/yii2-framework.git",
"url": "https://github.com/yiisoft/yii2-framework.git",
"reference": "5
3992b136b993e32ca7b6f399cf42b143f8685a6
"
"reference": "5
bfcb7a6dfa9771e2248eb8c4448613330f343ff
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/5
3992b136b993e32ca7b6f399cf42b143f8685a6
",
"url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/5
bfcb7a6dfa9771e2248eb8c4448613330f343ff
",
"reference": "5
3992b136b993e32ca7b6f399cf42b143f8685a6
",
"reference": "5
bfcb7a6dfa9771e2248eb8c4448613330f343ff
",
"shasum": ""
"shasum": ""
},
},
"require": {
"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/jquery.inputmask": "~3.2.2",
"bower-asset/punycode": "1.3.*",
"bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": "~2.0.1",
"bower-asset/yii2-pjax": "~2.0.1",
...
@@ -480,7 +480,7 @@
...
@@ -480,7 +480,7 @@
"framework",
"framework",
"yii2"
"yii2"
],
],
"time": "2016-
04-28 14:50:2
0"
"time": "2016-
10-20 12:02:5
0"
},
},
{
{
"name": "yiisoft/yii2-bootstrap",
"name": "yiisoft/yii2-bootstrap",
...
...
docker-compose.dev.yml
View file @
a6daa981
version
:
'
2'
version
:
'
2'
services
:
services
:
web
:
volumes
:
-
./web:/app/web
php
:
php
:
build
:
build
:
dockerfile
:
Dockerfile
dockerfile
:
Dockerfile
context
:
.
context
:
.
args
:
-
GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
environment
:
environment
:
-
PHP_USER_ID=
1000
-
PHP_USER_ID=
82
-
GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
-
GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
volumes
:
volumes
:
-
./composer.json:/app/composer.json
-
./composer.json:/app/composer.json
...
...
docker-compose.yml
View file @
a6daa981
version
:
'
2'
version
:
'
2'
services
:
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
:
php
:
image
:
${STACK_PHP_IMAGE}
build
:
.
volume
s
:
port
s
:
-
/app/web
-
20080:80
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment