Merge pull request #1080 from Koen1999/master

Created a working Docker image for production and development

Author: tomudding

.dockerignore

@@ -0,0 +1,54 @@
+*~
+*autoload_classmap.php
+*.gitignore
+*.kate-swp
+*.log
+.*.DS_Store
+.*.sw?
+._*
+.buildpath
+.editorconfig
+.env
+.env.dist
+.git/
+.gitattributes
+.idea/
+.mysql/
+.project
+.sass-cache/
+.scannerwork/
+.settings
+Vagrantfile
+.vagrant/
+.vs/
+.~lock.*
+Makefile
+autoload_classmap.php
+composer.phar
+config/autoload/doctrine.local.php
+config/autoload/doctrine.external.php
+config/autoload/gewisdb.local.php
+config/autoload/local.php
+config/autoload/zdt.local.php
+data/cache/*
+data/DoctrineORMModule/
+data/keys/jwt-key
+data/keys/jwt-key.pub
+data/logs/*
+data/mail/*
+docker/glide/
+docker/nginx/
+Dockerfile
+docker-compose.*
+gewisweb-vagrant/
+nbproject
+node_modules/
+public/css/gewis-theme.css
+public/css/gewis-theme.css.map
+public/data/education_temp_exams/
+public/data/education_temp_summaries/
+public/data/meeting-documents/
+public/data/meeting-notes/
+public/data/photo/
+public/styleguide/
+vendor/

.env.dist

@@ -0,0 +1,49 @@
+# Zend settings
+# Use production or development
+APP_ENV=production
+
+# Address for the Glide image server. Set to https://images.gewis.nl for production deployment behind nginx
+GLIDE_HOST=http://localhost:81
+# Signing key for the Glide image server
+GLIDE_KEY='v-LK4WCdhcfcc%jt*VC2cj%nVpu+xQKvLUA%H86kRVk_4bgG8&CWM#k*b_7MUJpmTc=4GFmKFp7=K%67je-skxC5vz+r#xT?62tT?Aw%FtQ4Y3gvnwHTwqhxUh89wCa_'
+
+# Nginx settings
+# Use off or "\"Restricted\"" (or another escaped string); also required an entry in docker/nginx/.htpasswd
+NGINX_REQUIRE_AUTH=off
+
+# Mail settings for production (postfix)
+SMTP_SERVER=mail.gewis.nl
+SMTP_PORT=587
+SMTP_USERNAME=service-web@gewis.nl
+SMTP_PASSWORD=gewis
+SERVER_HOSTNAME=gewis.nl
+
+# Google Calendar API (Option Calendar) settings
+DOCKER_GOOGLE_API_KEY=unknown
+DOCKER_GOOGLE_CALENDAR_KEY=unknown
+
+# These are the environment variabled for the databse used for all application data
+DOCKER_DB_HOST=mysql
+DOCKER_DB_PORT=3306
+DOCKER_DB_USERNAME=gewis
+DOCKER_DB_PASSWORD=gewis
+DOCKER_DB_DATABASE=gewis
+
+# These are the environment variabled for retrieving membership data (and others) from the gewisdb project
+DOCKER_DB2_HOST=postgres
+DOCKER_DB2_PORT=5432
+DOCKER_DB2_USERNAME=username
+DOCKER_DB2_PASSWORD=password
+DOCKER_DB2_DATABASE=database
+
+# These are the environment variables for PhpMyAdmin, only used in docker-compose.override.yaml for development
+PMA_HOST=mysql
+PMA_USER=gewis
+PMA_PASSWORD=gewis
+
+# These are the environment variables for MySQL, only used in docker-compose.override.yaml for development
+MYSQL_ROOT_PASSWORD=gewis
+MYSQL_DATABASE=gewis
+MYSQL_USER=gewis
+MYSQL_PASSWORD=gewis
+MYSQL_ALLOW_EMPTY_PASSWORD='yes'

.gitattributes

@@ -1 +1,2 @@
 * text=auto eol=lf
+

.gitignore

@@ -3,15 +3,18 @@ nbproject
 .~lock.*
 .*.sw?
 *~
+*.kate-swp
 .buildpath
-.DS_Store
+*.DS_Store
+.env
 .idea
 .project
 .settings
 vendor/
 gewisweb-vagrant/
 node_modules/
 .sass-cache/
+.scannerwork/
 public/css/gewis-theme.css
 public/css/gewis-theme.css.map
 public/styleguide/

.travis.yml

@@ -1,14 +1,43 @@
 language: php
-sudo: false
-php:
-  - 5.6
-  - 7.0
-
-env:
-  - APP_ENV=development
-  
+os: linux
+
+cache:
+    apt: true
+    ccache: true
+    directories:
+        -   $HOME/.composer/
+
+jobs:
+    include:
+        -   name:   "PHP 5.6 Production"
+            php:    5.6
+            env:    APP_ENV=production
+        -   name:   "PHP 5.6 Development"
+            php:    5.6
+            env:    APP_ENV=development
+        -   name:   "PHP 7.0 Production"
+            php:    7.0
+            env:    APP_ENV=production
+        -   name:   "PHP 7.0 Development"
+            php:    7.0
+            env:    APP_ENV=development
+        -   name:   "PHP 7.4 Production"
+            php:    7.4
+            env:    APP_ENV=production
+        -   name:   "PHP 7.4 Development"
+            php:    7.4
+            env:    APP_ENV=development
+        -   name:   "PHP 8.0 Production"
+            php:    8.0
+            env:    APP_ENV=production
+        -   name:   "PHP 8.0 Development"
+            php:    8.0
+            env:    APP_ENV=development
+
+
 before_script:
-    - composer install --prefer-source --ignore-platform-reqs
+    -   composer install --prefer-source --ignore-platform-reqs
+    -   ./genclassmap.sh
 
 script:
-  - (if (./web orm:validate-schema --no-ansi --no-interaction | grep -q "\[Mapping\]  FAIL"); then exit 1; else exit 0; fi)
+    -   (if (./web orm:validate-schema --no-ansi --no-interaction | grep -q "\[Mapping\]  FAIL"); then exit 1; fi)

Makefile

@@ -0,0 +1,121 @@
+.PHONY: help runprod rundev updatecomposer updatepackage build buildprod builddev login push pushprod pushdev update all prod dev
+
+help:
+		@echo "Makefile commands:"
+		@echo "runprod"
+		@echo "rundev"
+		@echo "updatecomposer"
+		@echo "updatepackage"
+		@echo "updatecss"
+		@echo "updateglide"
+		@echo "getvendordir"
+		@echo "replenish"
+		@echo "build"
+		@echo "buildprod"
+		@echo "builddev"
+		@echo "login"
+		@echo "push"
+		@echo "pushprod"
+		@echo "pushdev"
+		@echo "update = updatecomposer updatepackage updatecss updateglide"
+		@echo "all = build login push"
+		@echo "prod = buildprod login pushprod"
+		@echo "dev = builddev login pushdev"
+
+.DEFAULT_GOAL := all
+
+runprod:
+		@docker-compose -f docker-compose.yml up -d --force-recreate --remove-orphans
+
+runprodtest: buildprod
+		@docker-compose -f docker-compose.yml up -d --force-recreate --remove-orphans
+
+rundev: builddev
+		@docker-compose up -d --force-recreate --remove-orphans
+
+getvendordir: rundev
+		@rm -Rf vendor
+		@docker cp "$(shell docker-compose ps -q web)":/code/vendor ./vendor
+		@docker-compose down
+
+replenish: rundev
+		@docker cp ./public "$(shell docker-compose ps -q web)":/code
+		@docker-compose exec web chown -R www-data:www-data /code/public
+		@docker cp ./data "$(shell docker-compose ps -q web)":/code
+		@docker-compose exec web chown -R www-data:www-data /code/data
+		@docker-compose down
+
+update: rundev updatecomposer updatepackage updatecss updateglide
+		@docker-compose down
+
+updatecomposer:
+		@docker-compose exec web php composer.phar selfupdate
+		@docker-compose exec -T web cat composer.phar > composer.phar
+		@docker-compose exec web php composer.phar update
+		@docker-compose exec -T web cat composer.lock > composer.lock
+
+updatepackage:
+		@docker-compose exec web npm update
+		@docker-compose exec -T web cat package-lock.json > package-lock.json
+
+updatecss:
+		@docker-compose exec web npm run scss
+		@docker-compose exec -T web cat public/css/gewis-theme.css > public/css/gewis-theme.css
+
+updateglide:
+		@docker-compose exec glide php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+		@docker-compose exec glide php composer-setup.php
+		@docker-compose exec glide php -r "unlink('composer-setup.php');"
+		@docker-compose exec web php composer.phar selfupdate
+		@docker-compose exec -T web cat composer.phar > composer.phar
+		@docker-compose exec glide php composer.phar update
+		@docker-compose exec -T glide cat composer.lock > docker/glide/composer.lock
+
+all: build login push
+
+prod: buildprod login pushprod
+
+dev: builddev login pushdev
+
+build: buildweb buildglide buildnginx
+
+buildprod: buildwebprod buildglide buildnginx
+
+builddev: buildwebdev buildglide buildnginx
+
+buildweb: buildwebprod buildwebdev
+
+buildwebprod:
+		@docker build -t web.docker-registry.gewis.nl/gewisweb_web:production -f docker/web/production/Dockerfile .
+
+buildwebdev:
+		@docker build -t web.docker-registry.gewis.nl/gewisweb_web:development -f docker/web/development/Dockerfile .
+
+buildglide:
+		@docker build -t web.docker-registry.gewis.nl/gewisweb_glide:latest -f docker/glide/Dockerfile docker/glide
+
+buildnginx:
+		@docker build -t web.docker-registry.gewis.nl/gewisweb_nginx:latest -f docker/nginx/Dockerfile docker/nginx
+
+login:
+		@docker login web.docker-registry.gewis.nl
+
+push: pushweb pushglide pushnginx
+
+pushprod: pushwebprod pushglide pushnginx
+
+pushdev: pushwebdev pushglide pushnginx
+
+pushweb: pushwebprod pushwebdev
+
+pushwebprod:
+		@docker push web.docker-registry.gewis.nl/gewisweb_web:production
+
+pushwebdev:
+		@docker push web.docker-registry.gewis.nl/gewisweb_web:development
+
+pushglide:
+		@docker push web.docker-registry.gewis.nl/gewisweb_glide:latest
+
+pushnginx:
+		@docker push web.docker-registry.gewis.nl/gewisweb_nginx:latest