diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32eeb74..e4b1e60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,5 +36,6 @@ release:tags: cleanup: stage: cleanup script: + - docker-compose kill - docker-compose down -v when: always \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 35e700c..d3360ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM dmstr/phd5-app +FROM dmstr/phd5-app:5.0.0-beta3 -# Additional packages +# Additional packages, see also `docker-compose.dev.yml` for host-volumes #COPY ./composer.* /app/ #RUN composer install --prefer-dist -# Application environment configuration -#RUN cp src/app.env-dist src/app.env - -# PHP configuration -ENV APP_CONFIG_FILE=/app/src/modules/config.php +# Application environment & PHP configuration +#ENV APP_CONFIG_FILE=/app/src/modules/config.php \ +# APP_NAME=planck-myapp \ +# APP_TITLE="MyPlanck" \ +# APP_LANGUAGES=de,ru,en COPY ./src /app/src \ No newline at end of file diff --git a/README.md b/README.md index a367b12..e53f8e6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ planck ====== -0 line application template +Web application template built from `dmstr/phd5-app` ## Documentation @@ -9,9 +9,13 @@ planck ### Getting started + + Create environment config cp .env-dist .env + +Create application `src/local.env`, if needed. Build images @@ -28,28 +32,10 @@ Start stack docker-compose up -d -Open your - -## Demo - -http://demo.apptransporter.com.staging-2.oneba.se - -![Frontend](https://raw.githubusercontent.com/dmstr/gh-media/master/dmstr/planck/apptransporter-demo-frontend.png) -![Backend](https://raw.githubusercontent.com/dmstr/gh-media/master/dmstr/planck/apptransporter-demo-backend.png) - -## Support - - -## Contribute - - -## License - - - -## Resources - -- links +Open your browser + + open http://$DOCKER_HOST_IP:21080 + ---