adminer/Dockerfile

@@ -2,4 +2,7 @@ ARG IMAGE_NAME
 ARG IMAGE_VERSION
 FROM ${IMAGE_NAME}:${IMAGE_VERSION}
 
+# Clue adminer override
+#RUN sed -i 's/max_execution_time.*/max_execution_time = 600/g' /etc/php5/cli/php.ini && sed -i 's/max_input_time.*/max_input_time = 600/g' /etc/php5/fpm/php.ini
+
 COPY ["conf.d/", "/usr/local/etc/php/conf.d"]

adminer/run.sh

@@ -3,7 +3,7 @@
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
 IMAGE_NAME="adminer"
-IMAGE_VERSION="4.6.2"
+IMAGE_VERSION="4.6.1"
 
 SERVICE_NAME=adminer
 

aws-cli/.gitignore

@@ -3,4 +3,3 @@
 !Dockerfile
 !README.md
 !run.sh
-!Makefile

aws-cli/Makefile

@@ -1,27 +0,0 @@
-DOCKER_REGISTRY = dr.ys-dev.cz
-DOCKER_PUBLIC_REGISTRY = yoursystemcz
-APP_NAME = aws-cli
-
-all: build release clean
-
-version/3.5: IMAGE_VERSION=3.5
-version/latest: IMAGE_VERSION=3.6
-
-version/%:
-	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):$* --build-arg "IMAGE_NAME=alpine" --build-arg "IMAGE_VERSION=$(IMAGE_VERSION)" .
-
-release/%:
-	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$* $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
-	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$*
-	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
-
-clean/%:
-	docker rmi $(DOCKER_REGISTRY)/$(APP_NAME):$*
-	docker rmi $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
-
-
-build: version/3.5 version/latest
-
-release: release/3.5 release/latest
-
-clean: clean/3.5 clean/latest

aws-cli/run.sh

@@ -3,7 +3,7 @@
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
 IMAGE_NAME="alpine"
-IMAGE_VERSION="3.6"
+IMAGE_VERSION="3.4"
 
 SERVICE_NAME=aws-cli
 
@@ -230,29 +230,6 @@ move() {
 		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
 }
 
-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 "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 --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
-}
-
 
 setPermissions() {
 	local target_dir="$1"