Update run scripts for db import

.gitignore

@@ -1 +1,2 @@
 **/env.shinc
+.idea

adminer/Dockerfile

@@ -14,4 +14,7 @@ RUN apk add --no-cache \
 
 COPY ["conf.d/", "/usr/local/etc/php/conf.d"]
 
+ENV ADMINER_PLUGINS="dump-date dump-json dump-php dump-zip edit-calendar edit-textarea"
+ENV ADMINER_DESIGN="hever"
+
 USER adminer

adminer/Makefile

@@ -5,7 +5,7 @@ APP_NAME := adminer
 
 IMAGE_NAME := adminer
 
-VERSION := 4.7.5
+VERSION := 4.8.0
 
 all: build release
 .PHONY: all
@@ -19,8 +19,8 @@ release/%:
 	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$* $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
 	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$* $(DOCKER_MY_REGISTRY)/$(APP_NAME):$*
 	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$*
-	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
 	docker push $(DOCKER_MY_REGISTRY)/$(APP_NAME):$*
+	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
 
 
 build: version/$(VERSION)

adminer/run

@@ -3,7 +3,7 @@
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
 IMAGE_NAME="yoursystemcz/adminer"
-IMAGE_VERSION="4.7.3"
+IMAGE_VERSION="4.8.0"
 
 SERVICE_NAME=adminer
 

code-formatter/Dockerfile

@@ -1,22 +1,25 @@
-FROM node:10-slim
+FROM node:12-slim
+
+ARG PHP_VERSION
+ENV PHP_CS_FIXER_IGNORE_ENV=true
 
 # https support
 RUN apt-get update && \
-  apt-get install -y apt-transport-https ca-certificates
+  apt-get install -y apt-transport-https ca-certificates curl gnupg2
 
 # add yarn and php
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
   echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
   curl -sS https://packages.sury.org/php/apt.gpg | apt-key add - && \
-  echo "deb https://packages.sury.org/php/ stretch main" | tee /etc/apt/sources.list.d/php7.3.list && \
+  echo "deb https://packages.sury.org/php/ stretch main" | tee /etc/apt/sources.list.d/${PHP_VERSION}.list && \
   apt-get update && \
-  apt-get install -y yarn php7.3-cli && \
+  apt-get install -y yarn ${PHP_VERSION}-cli && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/* /tmp/* /var/tmp/*
 
 
 # add php fixer
-RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.14.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \
+RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.3/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \
     chmod a+x /usr/local/bin/php-cs-fixer
 
 WORKDIR /app

code-formatter/Makefile

@@ -23,13 +23,15 @@ all : build release
 
 
 build :
-	docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 .
+	docker build --build-arg VERSION=$(VERSION) --build-arg PHP_VERSION="php7.3" --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 .
+	docker build --build-arg VERSION=$(VERSION) --build-arg PHP_VERSION="php7.4" --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.4 .
 	docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php5.6 .
-	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)
+	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.4 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)
-	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 $(DOCKER_REGISTRY)/$(APP_NAME):latest
+	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.4 $(DOCKER_REGISTRY)/$(APP_NAME):latest
 
 release : build
 	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3
+	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.4
 	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php5.6
 	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)
 	docker push $(DOCKER_REGISTRY)/$(APP_NAME):latest

common.shinc

@@ -117,3 +117,19 @@ help() {
 
 	return 0
 }
+
+realpath $PWD > /dev/null 2>&1
+if [[ $? -ne 0 ]]; then
+	realpath() {
+	  OURPWD=$PWD
+	  cd "$(dirname "$1")"
+	  LINK=$(readlink "$(basename "$1")")
+	  while [ "$LINK" ]; do
+		cd "$(dirname "$LINK")"
+		LINK=$(readlink "$(basename "$1")")
+	  done
+	  REALPATH="$PWD/$(basename "$1")"
+	  cd "$OURPWD"
+	  echo "$REALPATH"
+	}
+fi

dev-proxy/Makefile

@@ -1,18 +1,18 @@
 DOCKER_REGISTRY = dr.ys-dev.cz
 DOCKER_PUBLIC_REGISTRY = yoursystemcz
 APP_NAME = dev-proxy
+APP_VERSION = 2.0
 
 
-
+all: build tag release
-all: build release
 
 
 build:
-	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):latest --build-arg "IMAGE_NAME=nimmis/alpine" --build-arg "IMAGE_VERSION=3.8" ./src
+	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):$(APP_VERSION) ./src
 
 tag:
-	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):latest $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):latest
+	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(APP_VERSION) $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$(APP_VERSION)
 
 release: tag
-	docker push $(DOCKER_REGISTRY)/$(APP_NAME):latest
+	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(APP_VERSION)
-	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):latest
+	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$(APP_VERSION)

dev-proxy/run

@@ -3,7 +3,7 @@
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
 IMAGE_NAME="yoursystemcz/dev-proxy"
-IMAGE_VERSION="latest"
+IMAGE_VERSION="2.0"
 
 SERVICE_NAME=dev-proxy
 
@@ -31,6 +31,7 @@ makePrivate() {
 		--name ${SERVICE_NAME} \
 		-v /var/run/docker.sock:/tmp/docker.sock:ro \
 		-v dev-proxy:/root/.caddy \
+		-v ${SCRIPT_PATH}/src/errorPages:/errorPages \
 		--restart=unless-stopped \
 		-p 127.0.0.1:80:80 \
 		-p 127.0.0.1:443:443 \
@@ -64,7 +65,7 @@ makePublic() {
 }
 
 reload() {
-	docker exec ${SERVICE_NAME} pkill -USR1 caddy
+	docker exec ${SERVICE_NAME} caddy reload --config /etc/caddy/Caddyfile
 }
 
 "$@"

dev-proxy/src/.dockerignore

@@ -0,0 +1,2 @@
+/.dockerignore
+/Dockerfile

dev-proxy/src/Dockerfile

@@ -1,6 +1,6 @@
-FROM alpine:3.8
+FROM alpine:3.12
 
-ARG CADDY_VERSION="0.11.1"
+ARG CADDY_VERSION="2.2.0"
 ARG FOREGO_VERSION="0.16.1"
 ARG DOCKER_GEN_VERSION="0.7.4"
 
@@ -32,19 +32,19 @@ RUN wget --quiet "https://github.com/jwilder/docker-gen/releases/download/$DOCKE
 
 RUN curl --silent --show-error --fail --location \
       --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
-      "https://github.com/mholt/caddy/releases/download/v${CADDY_VERSION}/caddy_v${CADDY_VERSION}_linux_amd64.tar.gz" \
+      "https://github.com/mholt/caddy/releases/download/v${CADDY_VERSION}/caddy_${CADDY_VERSION}_linux_amd64.tar.gz" \
     | tar --no-same-owner -C /usr/bin -xz \
   && chmod 0755 /usr/bin/caddy \
-  && /usr/bin/caddy -version \
+  && /usr/bin/caddy version \
   && apk del .build-dependencies
 
-EXPOSE 80 443 2015
+EXPOSE 80 443
 VOLUME /etc/caddy
 
 
 # Starting app:
 
-ADD . /code
+COPY [".", "/code"]
 WORKDIR /code
 
 ENTRYPOINT ["sh", "/code/docker-entrypoint.sh"]

dev-proxy/src/Procfile

@@ -1,2 +1,2 @@
-dockergen: docker-gen -notify-output -config /code/docker-gen/config/docker-gen.cfg
+dockergen: docker-gen -notify-output -config /code/docker-gen/config/docker-gen.cfg -notify caddy reload
-caddy: caddy --conf /etc/caddy/Caddyfile --log stdout
+caddy: caddy run --config /etc/caddy/Caddyfile --watch

dev-proxy/src/docker-gen/config/docker-gen.cfg

@@ -4,4 +4,4 @@ dest = "/etc/caddy/Caddyfile"
 onlyexposed = false
 watch = true
 wait = "500ms:2s"
-notifycmd = "pkill -USR1 caddy"
+notifycmd = "caddy reload --config /etc/caddy/Caddyfile"

dev-proxy/src/docker-gen/templates/Caddyfile.tmpl

@@ -1,14 +1,23 @@
 {{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }}
 
 {{ $hosts := groupByMulti $ "Env.VIRTUAL_HOST" "," }}
+{
+  auto_https disable_redirects
+  local_certs
+}
 
-{{ if not $hosts }}
+:80 {
+  log {
+   output stdout
+  }
 
-127.0.0.1:2015
+  root * /code/errorPages/siteNotFound
-log stdout
+  file_server
-errors stderr
+  header Cache-Control "no-cache, max-age=0"
+  try_files {path} /index.html
+}
 
-{{ else }}
+{{ if $hosts }}
 
   {{ range $host, $containers := $hosts }}
     {{ $c := first $containers }}
@@ -16,34 +25,40 @@ errors stderr
     {{ $port := coalesce $c.Env.VIRTUAL_PORT "80" }}
 
 http://{{ $host }}, https://{{ $host }}  {
-  tls self_signed
+  tls internal
+
+  reverse_proxy * {
+    header_up X-Real-IP {http.request.remote}
+    header_up X-Forwarded-Port {http.request.port}
+    header_up X-Forwarded-Proto {http.request.scheme}
+
+    flush_interval -1
 
-  proxy / {
-    policy round_robin
-    transparent
-    websocket
-    header_upstream Host {host}
-    header_upstream X-Real-IP {remote}
-    header_upstream X-Forwarded-For {remote}
-    header_upstream X-Forwarded-Proto {scheme}
     {{ range $i, $container := $containers }}
         {{ $addrLen := len $container.Addresses }}
         {{ range $knownNetwork := $CurrentContainer.Networks }}
           {{ range $containerNetwork := $container.Networks }}
             {{ if (and (and (ne $containerNetwork.Name "ingress") (ne $containerNetwork.Name "bridge")) (or (eq $knownNetwork.Name $containerNetwork.Name) (eq $knownNetwork.Name "host"))) }}
     ## Can be connected with "{{ $containerNetwork.Name }}" network
-    upstream {{ $containerNetwork.IP }}:{{ $port }}
+    to {{ $containerNetwork.IP }}:{{ $port }}
             {{ end }}
           {{ end }}
       {{ end }}
     {{ end }}
   }
 
-  gzip {
+
-    not /__webpack_hmr
+  @hmr {
+    not {
+      path /__webpack_hmr
+    }
+  }
+
+  encode @hmr gzip
+
+  log {
+    output stdout
   }
-  log stdout
-  errors stderr
 }
   {{ end }}
 

fathom/run

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+IMAGE_NAME="usefathom/fathom"
+IMAGE_VERSION="latest"
+
+SERVICE_NAME=fathom
+
+
+source ${SCRIPT_PATH}/../common.shinc
+
+#
+# Project specific variables
+#
+
+DOMAIN_NAME="fathom.loc"
+
+source ${SCRIPT_PATH}/env.shinc 2> /dev/null
+
+
+init() {
+	__init
+
+	NETWORKS=(${PROXY_NETWORK} ${DB_NETWORK})
+	__createNetworks
+
+	docker create \
+		--name ${SERVICE_NAME} \
+		-e VIRTUAL_HOST=${DOMAIN_NAME} \
+		-e VIRTUAL_PORT=8080 \
+		-e FATHOM_DATABASE_DRIVER="postgres" \
+		-e FATHOM_DATABASE_NAME="fathom" \
+		-e FATHOM_DATABASE_USER="root" \
+		-e FATHOM_DATABASE_PASSWORD="megaheslo" \
+		-e FATHOM_DATABASE_HOST="pgsql-db" \
+		-e FATHOM_DATABASE_SSLMODE="disable" \
+		-e FATHOM_SECRET="abcdefghijqrstuvw34567890" \
+		${IMAGE_NAME}:${IMAGE_VERSION}
+
+	[[ $? -ne 0 ]] && return 1
+
+	docker network connect ${PROXY_NETWORK} ${SERVICE_NAME}
+	[[ $? -ne 0 ]] && return 1
+
+
+	docker network connect ${DB_NETWORK} ${SERVICE_NAME}
+	[[ $? -ne 0 ]] && return 1
+
+	__ask_to_start
+}
+
+"$@"
+
+exit $?

maria-db/run

@@ -78,6 +78,8 @@ import() {
     return 0
   fi
 
+  __msg "Importing, please wait..."
+
   local path=$(realpath "${filename}")
   local name=$(basename "${path}")
 

pgsql-db/run

@@ -59,9 +59,47 @@ init() {
 	__ask_to_start
 }
 
+import() {
+  local dbname="$1"
+  shift
+  local filename="$1"
+  shift
+
+  if [[ "${dbname}" == "" ]] || [[ "${filename}" == "" ]]; then
+    __err "You must provide database name and filename of the file you want to import"
+    __msg "E.g. ./run import my-database-name \"\$PWD/my-file.sql\""
+    return 137
+  fi
+
+  if [[ ! -f "${filename}" ]]; then
+    __err "The filename was not located at ${filename}"
+    return 137
+  fi
+
+  echo -e "${C_WARN}This will import the file located at \"${C_WHITE}${filename}${C_WARN}\" to a database named \"${C_WHITE}${dbname}${C_WARN}\"${C_NONE}"
+
+  echo
+
+  __warn "Do you want to continue? [y/(n)] "
+
+  read CONTINUE
+
+  if [[ "${CONTINUE}" != "y" ]]; then
+    __msg "Quiting..."
+    return 0
+  fi
+
+  __msg "Importing, please wait..."
+
+  local path=$(realpath "${filename}")
+  local name=$(basename "${path}")
+
+  docker run --rm -it -v "${path}":"/import/${name}" --net ${DB_NETWORK} ${IMAGE_NAME}:${IMAGE_VERSION} pg_restore --no-owner -Fc --host=${SERVICE_NAME} --password --dbname=${dbname} "/import/${name}"
+}
+
 migrate9to10() {
   local migrationVolume="pgsql-9-10-dump-migration"
-  local migrationpath="/pgsql-data-dump"
+  local migrationPath="/pgsql-data-dump"
   stop
   docker volume create ${migrationVolume}
 
@@ -69,16 +107,20 @@ migrate9to10() {
     --name postgres_migration_from_9 \
     -v ${DB_VOLUME}:/var/lib/postgresql/data \
     -v ${PGSQL_DB_BIN}:/usr/lib/postgresql/${IMAGE_VERSION}/bin \
-    -v ${migrationVolume}:${migrationpath} \
+    -v ${migrationVolume}:${migrationPath} \
     -e POSTGRES_USER=${DB_USER} \
     -e POSTGRES_PASSWORD=${DB_PASSWORD} \
-    mdillon/postgis:9
+    mdillon/postgis:9.5
+
+  echo "Waiting for postgres to initialize"
+  sleep 10
 
   docker exec -it \
     postgres_migration_from_9 \
-    bash -c "pg_dumpall > /migration/full.dump"
+    bash -c "pg_dumpall > ${migrationPath}/full.dump"
 
   if [[ $? -ne 0 ]]; then
+    docker stop postgres_migration_from_9
     __err "Bad thing, don't continue, quitsies, bye"
     exit 137
   fi
@@ -92,15 +134,16 @@ migrate9to10() {
     --name postgres_migration_to_10 \
     -v ${DB_VOLUME}:/var/lib/postgresql/data \
     -v ${PGSQL_DB_BIN}:/usr/lib/postgresql/${IMAGE_VERSION}/bin \
-    -v ${migrationVolume}:${migrationpath} \
+    -v ${migrationVolume}:${migrationPath} \
     -e POSTGRES_USER=${DB_USER} \
     -e POSTGRES_PASSWORD=${DB_PASSWORD} \
-    mdillon/postgis:10 \
+    mdillon/postgis:10
-    psql -d postgres -f ${migrationpath}/full.dump
 
-  sudo docker exec -it \
+  echo "Waiting for postgres to initialize"
+  sleep 30
+  docker exec -it \
     postgres_migration_to_10 \
-    psql -f /migration/full.dump
+    psql -f ${migrationPath}/full.dump
 
   docker stop postgres_migration_to_10