Update run scripts for db import

- Updated node
- added json support

.gitignore

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

adminer/Dockerfile

@@ -6,6 +6,15 @@ USER root
 
 RUN rm /usr/local/etc/php/conf.d/0-upload_large_dumps.ini
 
+RUN apk add --no-cache \
+    $PHPIZE_DEPS \
+    && pecl install mongodb \
+    && pecl clear-cache \
+    && docker-php-ext-enable mongodb
+
 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

@@ -1,10 +1,11 @@
 DOCKER_REGISTRY := dr.ys-dev.cz
 DOCKER_PUBLIC_REGISTRY := yoursystemcz
+DOCKER_MY_REGISTRY := dr.cechis.cz
 APP_NAME := adminer
 
 IMAGE_NAME := adminer
 
-VERSION := 4.7.0
+VERSION := 4.8.0
 
 all: build release
 .PHONY: all
@@ -16,7 +17,9 @@ version/%:
 
 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_MY_REGISTRY)/$(APP_NAME):$*
 	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
 
 

adminer/run

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

aws-cli/run.sh

@@ -1,304 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
-
-IMAGE_NAME="alpine"
-IMAGE_VERSION="3.6"
-
-SERVICE_NAME=aws-cli
-
-
-source ${SCRIPT_PATH}/../common.shinc
-
-
-#
-# Project specific variables
-#
-AWS_DEFAULT_REGION=eu-central-1
-CUSTOM_ARGS=""
-
-# This directory will be mounted if no other directory is specified on the command line
-DEFAULT_DIRECTORY=${SCRIPT_PATH}
-
-# To enable the default directory mount point, override this setting to 1 in env.shinc
-USE_DEFAULT_DIRECTORY=0
-
-CURRENT_DATE="$(date +%Y-%m-%d)"
-platform=$(uname)
-
-if [[ ${platform} = "FreeBSD" ]] || [[ ${platform} = "Darwin" ]]; then
-	EXPIRES=$(date -v+365d '+%a, %d %b %Y 00:00:00 GMT')
-else
-	EXPIRES=$(date '+%a, %d %b %Y 00:00:00 GMT' -d "${CURRENT_DATE} + 365 day")
-fi
-
-CACHE_MAX_AGE="31536000"
-ACL="public-read"
-
-
-source ${SCRIPT_PATH}/env.shinc 2> /dev/null
-
-
-REQUIRED_VARIABLES=(AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY)
-
-for _var in ${REQUIRED_VARIABLES[@]}; do
-	if [ -z ${!_var+x} ]; then
-		echo "Please provide credential in env.shinc file, missing definition of variable: ${_var}"
-		exit 2
-	fi
-done
-
-
-init() {
-	__build
-
-	[[ $? -ne 0 ]] && return 1
-}
-
-cmd() {
-	local localDir
-
-
-	if [[ ${USE_DEFAULT_DIRECTORY} -eq 1 ]]; then
-		localDir=${DEFAULT_DIRECTORY}
-	else
-		__msg "Specify a mount point to /mnt/host inside the docker container"
-
-		read localDir
-
-		if [[ ${localDir} = "" ]]; then
-			localDir="$(pwd -P)"
-			__warn "You have not provided a directory, using default directory path: ${localDir}"
-			__msg "Continue? [(y)/n]"
-			read CONTINUE
-			if [[ ${CONTINUE} != "" ]] && [[ ${CONTINUE} != "y" ]] && [[ ${CONTINUE} != "Y" ]]; then
-				return 0
-			fi
-		fi
-	fi
-
-	__warn "Mounting ${localDir} to /mnt/host inside the docker container"
-
-	docker run --rm \
-		-u $(id -u):$(id -g) \
-		--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-		--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-		--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-		-v "${localDir}":/mnt/host \
-		${CUSTOM_ARGS} \
-		${SERVICE_NAME} \
-		aws "$@"
-}
-
-upload() {
-	local source="$1"
-	shift
-	local target="$1"
-	shift
-	local args="$@"
-
-	[[ ${source} = "" ]] && __err "You must provide a source directory (filesystem) as the first parameter" && return 137
-	[[ ${target} = "" ]] && __err "You must provide a target directory (s3) as the second parameter" && return 137
-
-	[[ ! -e ${source} ]] && __err "The source does not exist: ${source}" && return 6
-
-	__warn "Uploading ${source} to s3://${target}"
-
-	__msg "Cache expires on ${EXPIRES}"
-
-
-	if [[ -f ${source} ]]; then
-		# File
-		local dirName=$(dirname ${source})
-		local filename=$(basename ${source})
-		docker run --rm \
-			-u $(id -u):$(id -g) \
-			--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-			--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-			--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-			-v "${dirName}":/mnt/host \
-			${SERVICE_NAME} \
-			aws s3 cp "/mnt/host/${filename}" "s3://${target}" ${args} --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
-	else
-		# Directory
-		docker run --rm \
-			-u $(id -u):$(id -g) \
-			--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-			--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-			--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-			-v "${source}":/mnt/host \
-			${SERVICE_NAME} \
-			aws s3 cp /mnt/host "s3://${target}" ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
-	fi
-}
-
-download() {
-	local source="$1"
-	shift
-	local target="$1"
-	shift
-	local args="$@"
-
-	[[ ${source} = "" ]] && __err "You must provide a source (filesystem) as the first parameter" && return 137
-	[[ ${target} = "" ]] && __err "You must provide a target (s3) as the second parameter" && return 137
-
-	__warn "Downloading s3://${source} to ${target}"
-
-	if [[ ! -e ${target} ]]; then
-		__warn "The target ${target} does not exist. Is this a file (f) or a directory (d)? ..."
-		read type
-		if [[ ${type} = "f" ]]; then
-			mkdir -p $(dirname ${target})
-			touch ${target}
-		elif [[ ${type} = "d" ]]; then
-			mkdir -p ${target}
-		else
-			__err "The input is invalid, please use either 'f' or 'd'"
-		fi
-	fi
-
-	if [[ -f ${target} ]]; then
-		# File
-		local dirName=$(dirname ${target})
-		local filename=$(basename ${target})
-		docker run --rm \
-			-u $(id -u):$(id -g) \
-			--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-			--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-			--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-			-v "${dirName}":/mnt/host \
-			${SERVICE_NAME} \
-			aws s3 cp "s3://${source}" "/mnt/host/${filename}" ${args}
-	else
-		# Directory
-		docker run --rm \
-			-u $(id -u):$(id -g) \
-			--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-			--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-			--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-			-v "${target}":/mnt/host \
-			${SERVICE_NAME} \
-			aws s3 cp "s3://${source}" /mnt/host ${args} --recursive
-	fi
-
-}
-
-migrate() {
-	local source_dir="$1"
-	shift
-	local target_dir="$1"
-	shift
-	local args="$@"
-
-	[[ ${source_dir} = "" ]] && __err "You must provide a source directory (s3) as the first parameter" && return 137
-	[[ ${target_dir} = "" ]] && __err "You must provide a target directory (s3) as the second parameter" && return 137
-
-	__warn "Migrating s3://${source_dir} to s3://${target_dir}"
-
-	echo "Cache expires on ${EXPIRES}"
-
-	docker run --rm \
-		-u $(id -u):$(id -g) \
-		--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-		--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-		--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-		${SERVICE_NAME} \
-		aws s3 cp "s3://${source_dir}" "s3://${target_dir}" ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
-}
-
-
-move() {
-	local source_dir="$1"
-	shift
-	local target_dir="$1"
-	shift
-	local args="$@"
-
-	[[ ${source_dir} = "" ]] && __err "You must provide a source directory (s3) as the first parameter" && return 137
-	[[ ${target_dir} = "" ]] && __err "You must provide a target directory (s3) as the second parameter" && return 137
-
-	__warn "Migrating s3://${source_dir} to s3://${target_dir}"
-
-	echo "Cache expires on ${EXPIRES}"
-
-	docker run --rm \
-		-u $(id -u):$(id -g) \
-		--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-		--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-		--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-		${SERVICE_NAME} \
-		aws s3 mv "s3://${source_dir}" "s3://${target_dir}" ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
-}
-
-sync() {
-	local source_dir="$1"
-	shift
-	local target_dir="$1"
-	shift
-	local args="$@"
-
-	[[ ${source_dir} = "" ]] && __err "You must provide a source directory (s3) as the first parameter" && return 137
-	[[ ${target_dir} = "" ]] && __err "You must provide a target directory (s3) as the second parameter" && return 137
-
-	__warn "Syncing s3://${source_dir} to s3://${target_dir}"
-
-	echo "Cache expires on ${EXPIRES}"
-
-	docker run --rm \
-		-u $(id -u):$(id -g) \
-		--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-		--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-		--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-		${SERVICE_NAME} \
-		aws s3 sync "s3://${source_dir}" "s3://${target_dir}" ${args} --delete --metadata-directive COPY
-}
-
-
-setPermissions() {
-	local target_dir="$1"
-
-	if [[ ${target_dir} = "" ]]; then
-		__warn "Please provide an s3 path: "
-		read target_dir
-	fi
-
-	docker run --rm \
-		-u $(id -u):$(id -g) \
-		--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-		--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-		--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-		${SERVICE_NAME} \
-		aws s3 cp "s3://${target_dir}" "s3://${target_dir}" --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
-}
-
-
-exec() {
-	local source_dir="$1"
-
-	if [[ ${source_dir} = "" ]]; then
-		if [[ ${USE_DEFAULT_DIRECTORY} -eq 1 ]]; then
-			source_dir=${DEFAULT_DIRECTORY}
-		else
-			source_dir=$(pwd -P)
-			__warn "You have not provided a directory, using current path: ${source_dir}"
-			__msg "Continue? [(y)/n]"
-			read CONTINUE
-			if [[ ${CONTINUE} != "" ]] && [[ ${CONTINUE} != "y" ]] && [[ ${CONTINUE} != "Y" ]]; then
-				return 0
-			fi
-		fi
-	fi
-
-	docker run --rm -it \
-		-u $(id -u):$(id -g) \
-		--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-		--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-		--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-		-v "${source_dir}":/mnt/host \
-		${SERVICE_NAME} \
-		sh
-}
-
-"$@"
-
-exit $?

code-formatter/Dockerfile

@@ -1,28 +1,31 @@
-FROM node:8-stretch
+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/${PHP_VERSION}.list && \
   apt-get update && \
-  apt-get install -y yarn php7.0-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.10.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
 
 # add csscomb and prettier
-RUN yarn add prettier csscomb --global && \
+RUN npm install prettier csscomb --global
-  ln -s /app/node_modules/.bin/prettier /usr/local/bin/prettier && \
-  ln -s /app/node_modules/.bin/csscomb /usr/local/bin/csscomb
 
 COPY ["src/entry.sh", "/app/entry.sh"]
 

code-formatter/Dockerfile.56

@@ -1,4 +1,4 @@
-FROM node:8-slim
+FROM node:10-slim
 
 # https support
 RUN apt-get update && \
@@ -14,15 +14,13 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
 
 
 # add php fixer
-RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.10.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.14.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \
     chmod a+x /usr/local/bin/php-cs-fixer
 
 WORKDIR /app
 
 # add csscomb and prettier
-RUN yarn add prettier csscomb --global && \
+RUN npm install prettier csscomb --global
-  ln -s /app/node_modules/.bin/prettier /usr/local/bin/prettier && \
-  ln -s /app/node_modules/.bin/csscomb /usr/local/bin/csscomb
 
 COPY ["src/entry.sh", "/app/entry.sh"]
 

code-formatter/Makefile

@@ -17,15 +17,21 @@ GIT_TAG = $(shell git describe --tags --exact-match 2>/dev/null)
 
 VERSION := $(or $(GIT_TAG),latest)
 
-all : VERSION := 1.0.2
+all : VERSION := 1.1.2
 all : build release
 .PHONY : all
 
 
 build :
-	docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.2 .
+	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.2 $(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.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

code-formatter/src/entry.sh

@@ -32,6 +32,8 @@ main() {
 				_version="${VERSION}"
 		fi
 
+    __initVariables "$@"
+
 		__header "Code-Formatter [${_version}]"
 
 
@@ -41,25 +43,26 @@ main() {
 
 	case "${_cmd}" in
 		process)
-			__initVariables "$@"
 			source ${INCLUDES_PATH}/process.shinc
 			process
 			return $?
 			;;
 		prettier)
-			__initVariables "$@"
 			source ${INCLUDES_PATH}/formatters/prettier.shinc
-			__prettier
+			if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
+				__prettier ${CSS_FILES[@]}
+			fi
+			if [[ ${#JS_FILES[@]} -ne 0 ]]; then
+				__prettier ${JS_FILES[@]}
+			fi
 			return $?
 			;;
 		csscomb)
-			__initVariables "$@"
 			source ${INCLUDES_PATH}/formatters/csscomb.shinc
-			__csscomb
+			__csscomb ${CSS_FILES[@]}
 			return $?
 			;;
 		php-cs-fixer)
-			__initVariables "$@"
 			source ${INCLUDES_PATH}/formatters/php-cs-fixer.shinc
 			__phpFixer
 			return $?

code-formatter/src/inc/formatters/csscomb.shinc

@@ -3,11 +3,12 @@
 
 __csscomb() {
 	__msg "Csscomb:"
+	local files=("$@")
 
 	if [[ ${DRY_RUN} -eq 0 ]]; then
-		csscomb -v "${CSS_FILES[@]}"
+		csscomb -v "${files[@]}"
 	else
-		csscomb --lint -v "${CSS_FILES[@]}"
+		csscomb --lint -v "${files[@]}"
 	fi
 
 	return $?

code-formatter/src/inc/formatters/prettier.shinc

@@ -3,12 +3,13 @@
 
 __prettier() {
 	__msg "Prettier:"
+	local files=("$@")
 
 	if [[ ${DRY_RUN} -eq 0 ]]; then
-		prettier --write "${JS_FILES[@]}"
+		prettier --write "${files[@]}"
 	else
 		__msg "Listing (: unprettiered :) files:" 1
-		prettier --list-different "${JS_FILES[@]}"
+		prettier --list-different "${files[@]}"
 	fi
 
 	return $?

code-formatter/src/inc/functions.shinc

@@ -6,30 +6,35 @@
 
 # Colors
 __color_green() {
+  [[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
 	printf '\033[1;31;32m'
 	printf -- "%b" "$*"
 	printf '\033[0m'
 }
 
 __color_red() {
+  [[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
 	printf '\033[1;31m'
 	printf -- "%b" "$*"
 	printf '\033[0m'
 }
 
 __color_red_bg() {
+  [[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
 	printf '\033[1;41m'
 	printf -- "%b" "$*"
 	printf '\033[0m'
 }
 
 __color_white() {
+  [[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
 	printf '\033[1;37;40m'
 	printf -- "%b" "$*"
 	printf '\033[0m'
 }
 
 __color_yellow() {
+  [[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
 	printf '\033[1;31;33m'
 	printf -- "%b" "$*"
 	printf '\033[0m'

code-formatter/src/inc/process.shinc

@@ -11,13 +11,15 @@ process() {
 
 	# Run css comb
 	if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
-		__csscomb
+		__csscomb "${CSS_FILES[@]}"
+		[[ $? -ne 0 ]] && failed=1
+		__prettier "${CSS_FILES[@]}"
 		[[ $? -ne 0 ]] && failed=1
 	fi
 
 	# Run JS prettier
 	if [[ ${#JS_FILES[@]} -ne 0 ]]; then
-		__prettier
+		__prettier "${JS_FILES[@]}"
 		[[ $? -ne 0 ]] && failed=1
 	fi
 

code-formatter/src/inc/variables.shinc

@@ -11,6 +11,7 @@ PHP_FILES=()
 
 
 DRY_RUN=0
+OMIT_COLORS=0
 VERBOSE=0
 
 
@@ -21,6 +22,9 @@ __initVariables() {
 			--dry-run)
 				DRY_RUN=1
 				;;
+			--no-color)
+				OMIT_COLORS=1
+				;;
 			--verbose)
 				VERBOSE=1
 				;;
@@ -32,7 +36,7 @@ __initVariables() {
 					CSS_FILES+=("${1}")
 				fi
 				;;
-			*.js|*.jsx)
+			*.js|*.jsx|*.ts|*.tsx|*.json|*.vue)
 				__path_exists "${1}"
 				if [[ $? -ne 0 ]]; then
 					__err "Specified path does not exist: ${1}"

common.shinc

@@ -34,6 +34,19 @@ stop() {
 
 start() {
 	__msg "Starting container... " 0 no
+	docker inspect --type container "${SERVICE_NAME}" > /dev/null 2>&1
+
+	if [[ $? -ne 0 ]]; then
+		init
+
+		CURRENT_STATUS=$(docker inspect --format "{{.State.Running}}" "${SERVICE_NAME}")
+
+		if [[ "${CURRENT_STATUS}" == "true" ]]; then
+			return 0
+		fi
+	fi
+
+
 	STATUS=$(docker start ${SERVICE_NAME} 2>&1)
 	if [[ $? -ne 0 ]]; then
 		__err "${STATUS}"
@@ -104,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
 
@@ -18,6 +18,10 @@ source ${SCRIPT_PATH}/../common.shinc
 source ${SCRIPT_PATH}/env.shinc 2> /dev/null
 
 init() {
+	makePrivate
+}
+
+makePrivate() {
 	docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $?
 
 	NETWORKS=(${PROXY_NETWORK})
@@ -27,6 +31,7 @@ init() {
 		--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 \
@@ -38,9 +43,29 @@ init() {
 	__ask_to_start
 }
 
+makePublic() {
+	docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $?
+
+	NETWORKS=(${PROXY_NETWORK})
+	__createNetworks
+
+	docker create \
+		--name ${SERVICE_NAME} \
+		-v /var/run/docker.sock:/tmp/docker.sock:ro \
+		-v dev-proxy:/root/.caddy \
+		--restart=unless-stopped \
+		-p 80:80 \
+		-p 443:443 \
+		--net ${PROXY_NETWORK} \
+		${IMAGE_NAME}:${IMAGE_VERSION}
+
+	[[ $? -ne 0 ]] && return 1
+
+	__ask_to_start
+}
 
 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 }}
 

elastic-search-5/Dockerfile

@@ -0,0 +1,13 @@
+ARG IMAGE_NAME
+ARG IMAGE_VERSION
+FROM ${IMAGE_NAME}:${IMAGE_VERSION}
+
+RUN bin/elasticsearch-plugin install x-pack
+
+ADD elasticsearch.yml /usr/share/elasticsearch/config/
+
+USER root
+
+RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
+
+USER elasticsearch

elastic-search-5/elasticsearch.yml

@@ -0,0 +1,19 @@
+http:
+    host: 0.0.0.0
+transport:
+    host: 127.0.0.1
+xpack:
+    security:
+        enabled: false
+        authc:
+            anonymous:
+                roles:
+                  - role1
+                  - role2
+cluster:
+    routing:
+        allocation:
+            disk:
+                watermark:
+                    low: 0.90
+                    high: 0.95

elastic-search-5/run

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+IMAGE_NAME="elasticsearch"
+IMAGE_VERSION="5.6.16"
+
+SERVICE_NAME=ys-elastic-search-5
+
+
+source ${SCRIPT_PATH}/../common.shinc
+
+#
+# Project specific variables
+#
+
+DOMAIN_NAME="elastic5.loc"
+
+RELEASE_NAME="yoursystemcz/elasticsearch"
+RELEASE_VERSION="5.6.16"
+
+PERSISTENT_VOLUME="ys-elastic-5"
+
+source ${SCRIPT_PATH}/env.shinc 2> /dev/null
+
+
+init() {
+	__init
+
+	# Create networks
+	NETWORKS=(${SEARCH_ENGINE_NETWORK} ${PROXY_NETWORK})
+	__createNetworks
+
+	docker create \
+		--name ${SERVICE_NAME} \
+		-e VIRTUAL_HOST=${DOMAIN_NAME} \
+		-e VIRTUAL_PORT=9200 \
+		-v ${PERSISTENT_VOLUME}:/usr/share/elasticsearch/data \
+		--net ${SEARCH_ENGINE_NETWORK} \
+		${RELEASE_NAME}:${RELEASE_VERSION}
+
+	[[ $? -ne 0 ]] && return 1
+
+	docker network connect ${PROXY_NETWORK} ${SERVICE_NAME}
+
+	__ask_to_start
+}
+
+build() {
+        docker build \
+                --build-arg IMAGE_NAME=${IMAGE_NAME} \
+                --build-arg IMAGE_VERSION=${IMAGE_VERSION} \
+                -t ${RELEASE_NAME}:${RELEASE_VERSION} \
+                ${SCRIPT_PATH}
+}
+
+release() {
+	build
+
+	docker push ${RELEASE_NAME}:${RELEASE_VERSION}
+
+	return $?
+}
+
+"$@"
+
+exit $?

elastic-search-6/Dockerfile

@@ -0,0 +1,11 @@
+ARG IMAGE_NAME
+ARG IMAGE_VERSION
+FROM ${IMAGE_NAME}:${IMAGE_VERSION}
+
+ADD elasticsearch.yml /usr/share/elasticsearch/config/
+
+USER root
+
+RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
+
+USER elasticsearch

elastic-search-6/elasticsearch.yml

@@ -0,0 +1,19 @@
+http:
+    host: 0.0.0.0
+transport:
+    host: 127.0.0.1
+xpack:
+    security:
+        enabled: false
+        authc:
+            anonymous:
+                roles:
+                  - role1
+                  - role2
+cluster:
+    routing:
+        allocation:
+            disk:
+                watermark:
+                    low: 0.90
+                    high: 0.95

elastic-search-6/run

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+IMAGE_NAME="elasticsearch"
+IMAGE_VERSION="6.5.4"
+
+SERVICE_NAME=ys-elastic-search-6
+
+
+source ${SCRIPT_PATH}/../common.shinc
+
+#
+# Project specific variables
+#
+
+DOMAIN_NAME="elastic6.loc"
+
+RELEASE_NAME="yoursystemcz/elasticsearch"
+RELEASE_VERSION="6.5.4"
+
+PERSISTENT_VOLUME="ys-elastic-6"
+
+source ${SCRIPT_PATH}/env.shinc 2> /dev/null
+
+
+init() {
+	__init
+
+	# Create networks
+	NETWORKS=(${SEARCH_ENGINE_NETWORK} ${PROXY_NETWORK})
+	__createNetworks
+
+	docker create \
+		--name ${SERVICE_NAME} \
+		-e VIRTUAL_HOST=${DOMAIN_NAME} \
+		-e VIRTUAL_PORT=9200 \
+		-v ${PERSISTENT_VOLUME}:/usr/share/elasticsearch/data \
+		--net ${SEARCH_ENGINE_NETWORK} \
+		${RELEASE_NAME}:${RELEASE_VERSION}
+
+	[[ $? -ne 0 ]] && return 1
+
+	docker network connect ${PROXY_NETWORK} ${SERVICE_NAME}
+
+	__ask_to_start
+}
+
+build() {
+        docker build \
+                --build-arg IMAGE_NAME=${IMAGE_NAME} \
+                --build-arg IMAGE_VERSION=${IMAGE_VERSION} \
+                -t ${RELEASE_NAME}:${RELEASE_VERSION} \
+                ${SCRIPT_PATH}
+}
+
+release() {
+	build
+
+	docker push ${RELEASE_NAME}:${RELEASE_VERSION}
+
+	return $?
+}
+
+"$@"
+
+exit $?

elastic-search/Dockerfile

@@ -2,8 +2,6 @@ ARG IMAGE_NAME
 ARG IMAGE_VERSION
 FROM ${IMAGE_NAME}:${IMAGE_VERSION}
 
-RUN bin/elasticsearch-plugin install x-pack
-
 ADD elasticsearch.yml /usr/share/elasticsearch/config/
 
 USER root

elastic-search/elasticsearch.yml

@@ -10,3 +10,10 @@ xpack:
                 roles:
                   - role1
                   - role2
+cluster:
+    routing:
+        allocation:
+            disk:
+                watermark:
+                    low: 0.90
+                    high: 0.95

elastic-search/run

@@ -5,7 +5,6 @@ SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 IMAGE_NAME="elasticsearch"
 # Old version, AWS supported
 IMAGE_VERSION="2.3.5"
-#IMAGE_VERSION="5.3.2"
 
 SERVICE_NAME=ys-elastic-search
 
@@ -21,7 +20,6 @@ DOMAIN_NAME="elastic.loc"
 RELEASE_NAME="yoursystemcz/elasticsearch"
 # Old version, AWS supported
 RELEASE_VERSION="2.3.5"
-#RELEASE_VERSION="5.3.2"
 
 PERSISTENT_VOLUME="ys-elastic"
 

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

@@ -3,7 +3,7 @@
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
 IMAGE_NAME="mariadb"
-IMAGE_VERSION="10.1"
+IMAGE_VERSION="10.3"
 
 SERVICE_NAME=maria-db
 
@@ -32,6 +32,7 @@ init() {
 		--name ${SERVICE_NAME} \
 		--restart=unless-stopped \
 		-v ${DB_VOLUME}:/var/lib/mysql \
+		-p 127.0.0.1::3306 \
 		-e MYSQL_ROOT_PASSWORD=${DB_PASSWORD} \
 		--net ${DB_NETWORK} \
 		${IMAGE_NAME}:${IMAGE_VERSION}
@@ -46,6 +47,46 @@ cmd() {
 	docker run --rm -it -v $PWD:/current --net ${DB_NETWORK} ${IMAGE_NAME}:${IMAGE_VERSION} $@
 }
 
+
+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} mysql -h ${SERVICE_NAME} -u root -p${DB_PASSWORD} "${dbname}" -e "source /import/${name}"
+
+}
+
 bash() {
         cmd bash
 }
@@ -56,7 +97,7 @@ backup() {
 	local user=$(id -u)
 
 	mkdir -p ${BACKUP_DIR} && \
-	docker run --rm --volumes-from ${SERVICE_NAME} -v ${BACKUP_DIR}:/backup busybox tar cvf /backup/backup.tar /var/lib/mysql && chown -R ${user}:${user} ./backup
+	docker run --rm --volumes-from ${SERVICE_NAME} -v ${BACKUP_DIR}:/backup busybox tar cvf /backup/backup.tar /var/lib/mysql && sudo chown -R ${user}:${user} ./backup
 	if [[ $? -ne 0 ]]; then
 		__err "Could not create the backup"
 		exit 2

node-interpretter/Makefile

@@ -0,0 +1,18 @@
+DOCKER_REGISTRY = dr.ys-dev.cz
+DOCKER_PUBLIC_REGISTRY = yoursystemcz
+APP_NAME = node-interpretter
+
+
+
+all: build release
+
+
+build:
+	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):latest --build-arg "IMAGE_NAME=node" --build-arg "IMAGE_VERSION=10.15.0-slim" ./src
+
+tag:
+	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):latest $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):latest
+
+release: tag
+	docker push $(DOCKER_REGISTRY)/$(APP_NAME):latest
+	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):latest

node-interpretter/bin/node

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+SERVICE_NAME="node-interpretter"
+
+source ${SCRIPT_PATH}/shared.env.shinc 2> /dev/null
+source ${SCRIPT_PATH}/env.shinc 2> /dev/null
+
+
+docker inspect --type container ${SERVICE_NAME} > /dev/null 2>&1
+
+if [[ $? -ne 0 ]]; then
+	echo "The node container does not exist"
+	exit 137
+fi
+
+NODE_SERVICE_STATE=$(docker inspect --type container ${SERVICE_NAME} --format "{{.State.Running}}")
+if [[ $? -ne 0 ]]; then
+	echo "Could not get state of the node container"
+	exit 137
+fi
+
+if [[ "${NODE_SERVICE_STATE}" != "true" ]]; then
+	docker start ${SERVICE_NAME} > /dev/null 2>&1
+
+	if [[ $? -ne 0 ]]; then
+		echo "Could not start the node container"
+		exit 137
+	fi
+fi
+
+
+case "${1}" in
+	npm|npx|yarn|yarnpkg|*npm-cli.js*|*npx-cli.js*)
+		docker exec -i ${SERVICE_NAME} "$@"
+		;;
+	*)
+		docker exec -i ${SERVICE_NAME} node "$@"
+		;;
+esac

node-interpretter/bin/npm

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+node npm "$@"

node-interpretter/bin/npx

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+node npx "$@"

node-interpretter/bin/yarn

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+node yarn "$@"

node-interpretter/bin/yarnpkg

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+node yarnpkg "$@"

node-interpretter/env.shinc.example

@@ -0,0 +1,3 @@
+PROJECTS_PATH="${HOME}/projects"
+MOUNT_PATHS=("${HOME}:${HOME}" "${PROJECTS_PATH}:/projects" "/mnt:/mnt")
+#RESTART=1

node-interpretter/run

@@ -0,0 +1,129 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+IMAGE_NAME="yoursystemcz/node-interpretter"
+IMAGE_VERSION="latest"
+
+SERVICE_NAME="node-interpretter"
+
+
+source ${SCRIPT_PATH}/../common.shinc
+
+#
+# Project specific variables
+#
+
+MOUNT_PATHS=()
+RESTART=0
+
+source ${SCRIPT_PATH}/shared.env.shinc 2> /dev/null
+source ${SCRIPT_PATH}/env.shinc 2> /dev/null
+
+
+__createLink() {
+	local continue
+	local hostPath="${1}"
+	local binaryLink="${2}"
+
+	if [[ -f "${hostPath}" || -L "${hostPath}" ]]; then
+		__warn "There is already a ${hostPath}, are you sure you want to replace it? [y/(n)]:"
+		read continue
+		if [[ "${continue}" == "y" || "${continue}" == "Y" ]]; then
+			__msg "Linking node binary at ${hostPath}"
+			sudo rm -f "${hostPath}"
+			sudo ln -s "${SCRIPT_PATH}/bin/${binaryLink}" "${hostPath}"
+			[[ $? -ne 0 ]] && __err "Could not link ${binaryLink} binary at ${hostPath}" && return 137
+		fi
+	else
+		__msg "Linking node binary at ${hostPath}"
+		sudo ln -s "${SCRIPT_PATH}/bin/${binaryLink}" "${hostPath}"
+	fi
+}
+
+__deleteLink() {
+	local hostPath="${1}"
+	local binaryLink="${2}"
+
+	if [[ -L "${hostPath}" ]]; then
+		local linkName=$(readlink -f "${hostPath}")
+		if [[ $? -eq 0 && "${linkName}" == "${SCRIPT_PATH}/bin/${binaryLink}" ]]; then
+			__warn "Removing link at ${hostPath}"
+			sudo rm -f ${hostPath}
+		fi
+	fi
+}
+
+__createLinks() {
+	__createLink "${NODE_HOST_PATH}" node
+	__createLink "${NODE_HOST_PATH}js" node
+	__createLink "${NPM_HOST_PATH}" npm
+	__createLink "${NPX_HOST_PATH}" npx
+	__createLink "${YARN_HOST_PATH}" yarn
+	__createLink "${YARNPKG_HOST_PATH}" yarnpkg
+}
+
+__deleteLinks() {
+	__deleteLink "${NODE_HOST_PATH}" node
+	__deleteLink "${NODE_HOST_PATH}js" node
+	__deleteLink "${NPM_HOST_PATH}" npm
+	__deleteLink "${NPX_HOST_PATH}" npx
+	__deleteLink "${YARN_HOST_PATH}" yarn
+	__deleteLink "${YARNPKG_HOST_PATH}" yarnpkg
+}
+
+init() {
+	__createLinks
+
+	local mountPaths=""
+        [[ ${#MOUNT_PATHS[@]} -eq 0 ]] && __err "No MOUNT_PATHS were specified. Please provide these in an .env.shinc file at ${SCRIPT_PATH}/.env.shinc" && return 137
+        for mountPath in ${MOUNT_PATHS[@]}; do
+                mountPaths="${mountPaths} -v ${mountPath}"
+        done
+
+	args="${mountPaths} -v ${SCRIPT_PATH}/configs/${SERVICE_NAME/plex_/}:/config"
+
+        if [[ ${RESTART} -eq 1 ]]; then
+                args="${args} --restart=always"
+        fi
+
+	docker create \
+		--name ${SERVICE_NAME} \
+		--user $(id -u) \
+		-v ${SSH_KEY}:/home/node/.ssh/${SSH_KEY_NAME} \
+		-v ${KNOWN_HOSTS}:/home/node/.ssh/known_hosts \
+		-v npm-cache:/home/node/.npm \
+		-e TZ=Europe/Prague \
+		${args} \
+		--net host \
+		--entrypoint /cmd \
+		${IMAGE_NAME}:${IMAGE_VERSION}
+
+	[[ $? -ne 0 ]] && __err "Could not create the docker container" && return 137
+
+	docker start ${SERVICE_NAME} && \
+	docker exec --user 0 ${SERVICE_NAME} mkdir -p /usr/local/lib/node_modules && \
+	docker exec --user 0 ${SERVICE_NAME} chown $(id -u) /usr/local/lib/node_modules && \
+	docker exec --user 0 ${SERVICE_NAME} chown $(id -u) /usr/local/bin
+}
+
+remove() {
+	stop
+
+	__msg "Removing container... " 0 no
+	STATUS=$(docker rm ${SERVICE_NAME} 2>&1)
+	if [[ $? -ne 0 ]]; then
+		__err "${STATUS}"
+		return 1
+	else
+		__success "[ok]"
+	fi
+
+	__deleteLinks
+
+	return 0
+}
+
+"$@"
+
+exit $?

node-interpretter/shared.env.shinc

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+SSH_KEY="$HOME/.ssh/id_rsa"
+SSH_KEY_NAME="id_rsa"
+KNOWN_HOSTS="${HOME}/.ssh/known_hosts"
+PROJECTS_PATH="${HOME}/projects"
+
+NODE_HOST_PATH="/usr/local/bin/node"
+NPM_HOST_PATH="/usr/local/bin/npm"
+NPX_HOST_PATH="/usr/local/bin/npx"
+YARN_HOST_PATH="/usr/local/bin/yarn"
+YARNPKG_HOST_PATH="/usr/local/bin/yarnpkg"

node-interpretter/src/Dockerfile

@@ -0,0 +1,8 @@
+ARG IMAGE_NAME
+ARG IMAGE_VERSION
+
+FROM ${IMAGE_NAME}:${IMAGE_VERSION}
+
+COPY ["./cmd", "/cmd"]
+
+ENTRYPOINT ["node"]

node-interpretter/src/cmd

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+echo "Waiting for commands..."
+while :
+do
+   sleep 10 &
+   wait
+done
+
+
+exit 0

pgadmin/run

@@ -2,8 +2,8 @@
 
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
-IMAGE_NAME="chorss/docker-pgadmin4"
+IMAGE_NAME="dpage/pgadmin4"
-IMAGE_VERSION="3.0"
+IMAGE_VERSION="4.10"
 
 SERVICE_NAME=pgadmin
 
@@ -15,6 +15,8 @@ source ${SCRIPT_PATH}/../common.shinc
 #
 
 DOMAIN_NAME="pgadmin.loc"
+PGADMIN_DEFAULT_EMAIL="admin"
+PGADMIN_DEFAULT_PASSWORD="admin"
 
 source ${SCRIPT_PATH}/env.shinc 2> /dev/null
 
@@ -29,8 +31,10 @@ init() {
 	docker create \
 		--name ${SERVICE_NAME} \
 		-e VIRTUAL_HOST=${DOMAIN_NAME} \
-		-e VIRTUAL_PORT=5050 \
+		-e VIRTUAL_PORT=80 \
-		-v pgadmin_data:/data \
+		-e PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL} \
+		-e PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} \
+		-v pgadmin:/var/lib/pgadmin \
 		--restart=unless-stopped \
 		${IMAGE_NAME}:${IMAGE_VERSION}
 

pgsql-db/run

@@ -0,0 +1,155 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+IMAGE_NAME="postgres"
+IMAGE_VERSION="10.9"
+
+POSTGIS_MAJOR="2.5"
+POSTGIS_VERSION="2.5.2+dfsg-1~exp1.pgdg90+1"
+
+SERVICE_NAME=pgsql-db
+
+source ${SCRIPT_PATH}/../common.shinc
+
+#
+# Project specific variables
+#
+
+DB_VOLUME=pgsql_persistent_10
+PORT=5432
+
+source ${SCRIPT_PATH}/env.shinc 2> /dev/null
+
+
+__build() {
+	docker build \
+		--build-arg IMAGE_NAME=${IMAGE_NAME} \
+		--build-arg VERSION=${IMAGE_VERSION} \
+		--build-arg POSTGIS_MAJOR=${IMAGE_VERSION} \
+		--build-arg POSTGIS_VERSION=${IMAGE_VERSION} \
+		-t ${SERVICE_NAME}:latest \
+		${SCRIPT_PATH}/build
+
+	return $?
+
+}
+
+init() {
+	__init
+
+	NETWORKS=(${DB_NETWORK})
+	__createNetworks
+
+	__msg "Removing old postgres bin volume..."
+	docker volume rm -f ${PGSQL_DB_BIN} &&
+	docker create \
+		--name ${SERVICE_NAME} \
+		--restart=unless-stopped \
+		-v ${DB_VOLUME}:/var/lib/postgresql/data \
+		-v ${PGSQL_DB_BIN}:/usr/lib/postgresql/${IMAGE_VERSION}/bin \
+		-e POSTGRES_USER=${DB_USER} \
+		-e POSTGRES_PASSWORD=${DB_PASSWORD} \
+		--net ${DB_NETWORK} \
+		-p ${PORT}:5432 \
+		${IMAGE_NAME}:${IMAGE_VERSION}
+
+	[[ $? -ne 0 ]] && return 1
+
+	__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"
+  stop
+  docker volume create ${migrationVolume}
+
+  docker run --rm -d \
+    --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} \
+    -e POSTGRES_USER=${DB_USER} \
+    -e POSTGRES_PASSWORD=${DB_PASSWORD} \
+    mdillon/postgis:9.5
+
+  echo "Waiting for postgres to initialize"
+  sleep 10
+
+  docker exec -it \
+    postgres_migration_from_9 \
+    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
+
+  docker stop postgres_migration_from_9
+
+  docker volume rm -f ${DB_VOLUME}
+  docker volume create ${DB_VOLUME}
+
+  docker run --rm -d \
+    --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} \
+    -e POSTGRES_USER=${DB_USER} \
+    -e POSTGRES_PASSWORD=${DB_PASSWORD} \
+    mdillon/postgis:10
+
+  echo "Waiting for postgres to initialize"
+  sleep 30
+  docker exec -it \
+    postgres_migration_to_10 \
+    psql -f ${migrationPath}/full.dump
+
+  docker stop postgres_migration_to_10
+
+  __init
+}
+
+"$@"
+
+exit $?

pgsql-db/run.sh

@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
-
-IMAGE_NAME="mdillon/postgis"
-IMAGE_VERSION="9.5"
-
-SERVICE_NAME=pgsql-db
-
-
-source ${SCRIPT_PATH}/../common.shinc
-
-#
-# Project specific variables
-#
-
-DB_VOLUME=pgsql_persistent
-PORT=5432
-
-source ${SCRIPT_PATH}/env.shinc 2> /dev/null
-
-
-init() {
-	__init
-
-	NETWORKS=(${DB_NETWORK})
-	__createNetworks
-
-	__msg "Removing old postgres bin volume..."
-	docker volume rm -f ${PGSQL_DB_BIN} &&
-	docker create \
-		--name ${SERVICE_NAME} \
-		--restart=unless-stopped \
-		-v ${DB_VOLUME}:/var/lib/postgresql/data \
-		-v ${PGSQL_DB_BIN}:/usr/lib/postgresql/${IMAGE_VERSION}/bin \
-		-e POSTGRES_USER=${DB_USER} \
-		-e POSTGRES_PASSWORD=${DB_PASSWORD} \
-		--net ${DB_NETWORK} \
-		-p ${PORT}:5432 \
-		${IMAGE_NAME}:${IMAGE_VERSION}
-
-	[[ $? -ne 0 ]] && return 1
-
-	__ask_to_start
-}
-
-"$@"
-
-exit $?