diff --git a/adminer/Makefile b/adminer/Makefile index fd20ce2..2ee22e7 100644 --- a/adminer/Makefile +++ b/adminer/Makefile @@ -4,20 +4,15 @@ APP_NAME := adminer IMAGE_NAME := adminer -LATEST_VERSION := 4.6.2 +VERSION := 4.6.3 all: build release .PHONY: all -version/$(LATEST_VERSION): IMAGE_VERSION=$(LATEST_VERSION) -version/4.5: IMAGE_VERSION=4.5 -version/4.4: IMAGE_VERSION=4.4 -version/4.3.1: IMAGE_VERSION=4.3.1 +version/$(VERSION): IMAGE_VERSION=$(VERSION) version/%: - docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):$* --build-arg "IMAGE_NAME=$(IMAGE_NAME)" --build-arg "IMAGE_VERSION=$(IMAGE_VERSION)" . -version/4.6.2-clue: - docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):4.6.2-clue --build-arg "IMAGE_NAME=clue/adminer" --build-arg "IMAGE_VERSION=latest" . + docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):$* --build-arg "IMAGE_NAME=$(IMAGE_NAME)" --build-arg "IMAGE_VERSION=$*" . release/%: docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$* $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$* @@ -25,6 +20,6 @@ release/%: docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$* -build: version/$(LATEST_VERSION) version/4.5 version/4.4 version/4.3.1 version/4.6.2-clue +build: version/$(VERSION) -release: release/$(LATEST_VERSION) release/4.5 release/4.4 release/4.3.1 release/4.6.2-clue +release: release/$(VERSION) diff --git a/adminer/run.sh b/adminer/run.sh index de7a319..7e02ca1 100755 --- a/adminer/run.sh +++ b/adminer/run.sh @@ -3,7 +3,7 @@ SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P ) IMAGE_NAME="yoursystemcz/adminer" -IMAGE_VERSION="4.6.2-clue" +IMAGE_VERSION="4.6.3" SERVICE_NAME=adminer @@ -28,7 +28,6 @@ init() { NETWORKS=(${DB_NETWORK} ${PROXY_NETWORK}) __createNetworks - __build || return $? docker create \ --name ${SERVICE_NAME} \