Your-System/Docker-development
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update adminer

Browse Source
This commit is contained in:
Arnie 2018-08-16 08:10:18 +02:00
parent f80f641021
commit 678adadc81
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
adminer/Makefile
View File

@ -4,20 +4,15 @@ APP_NAME := adminer
IMAGE_NAME := adminer IMAGE_NAME := adminer
LATEST_VERSION := 4.6.2 VERSION := 4.6.3
all: build release all: build release
.PHONY: all .PHONY: all
version/$(LATEST_VERSION): IMAGE_VERSION=$(LATEST_VERSION) version/$(VERSION): IMAGE_VERSION=$(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/%:
docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):$* --build-arg "IMAGE_NAME=$(IMAGE_NAME)" --build-arg "IMAGE_VERSION=$(IMAGE_VERSION)" . docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):$* --build-arg "IMAGE_NAME=$(IMAGE_NAME)" --build-arg "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" .
release/%: release/%:
docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$* $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$* docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$* $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
@ -25,6 +20,6 @@ release/%:
docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$* 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)

3
adminer/run.sh
View File

@ -3,7 +3,7 @@
SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P ) SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
IMAGE_NAME="yoursystemcz/adminer" IMAGE_NAME="yoursystemcz/adminer"
IMAGE_VERSION="4.6.2-clue" IMAGE_VERSION="4.6.3"
SERVICE_NAME=adminer SERVICE_NAME=adminer
@ -28,7 +28,6 @@ init() {
NETWORKS=(${DB_NETWORK} ${PROXY_NETWORK}) NETWORKS=(${DB_NETWORK} ${PROXY_NETWORK})
__createNetworks __createNetworks
__build || return $?
docker create \ docker create \
--name ${SERVICE_NAME} \ --name ${SERVICE_NAME} \