Compare commits
No commits in common. "f80f64102111fa705033de3bad395fa97e958757" and "0885939ae131b50127adf721a13b81dcf02bc6aa" have entirely different histories.
f80f641021
...
0885939ae1
@ -1,30 +0,0 @@
|
|||||||
DOCKER_REGISTRY := dr.ys-dev.cz
|
|
||||||
DOCKER_PUBLIC_REGISTRY := yoursystemcz
|
|
||||||
APP_NAME := adminer
|
|
||||||
|
|
||||||
IMAGE_NAME := adminer
|
|
||||||
|
|
||||||
LATEST_VERSION := 4.6.2
|
|
||||||
|
|
||||||
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/%:
|
|
||||||
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" .
|
|
||||||
|
|
||||||
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):$*
|
|
||||||
|
|
||||||
|
|
||||||
build: version/$(LATEST_VERSION) version/4.5 version/4.4 version/4.3.1 version/4.6.2-clue
|
|
||||||
|
|
||||||
release: release/$(LATEST_VERSION) release/4.5 release/4.4 release/4.3.1 release/4.6.2-clue
|
|
||||||
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
|
SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
|
||||||
|
|
||||||
IMAGE_NAME="yoursystemcz/adminer"
|
IMAGE_NAME="adminer"
|
||||||
IMAGE_VERSION="4.6.2-clue"
|
IMAGE_VERSION="4.6.2"
|
||||||
|
|
||||||
SERVICE_NAME=adminer
|
SERVICE_NAME=adminer
|
||||||
|
|
||||||
|
|||||||
@ -29,8 +29,8 @@ init() {
|
|||||||
-v dev-proxy:/root/.caddy \
|
-v dev-proxy:/root/.caddy \
|
||||||
--restart=unless-stopped \
|
--restart=unless-stopped \
|
||||||
-p 80:80 \
|
-p 80:80 \
|
||||||
-p 127.0.0.1:443:443 \
|
-p 443:443 \
|
||||||
-p 127.0.0.1:2015:2015 \
|
-p 2015:2015 \
|
||||||
--net ${PROXY_NETWORK} \
|
--net ${PROXY_NETWORK} \
|
||||||
${IMAGE_NAME}:${IMAGE_VERSION}
|
${IMAGE_NAME}:${IMAGE_VERSION}
|
||||||
|
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
|
|
||||||
|
|
||||||
IMAGE_NAME="chorss/docker-pgadmin4"
|
|
||||||
IMAGE_VERSION="3.0"
|
|
||||||
|
|
||||||
SERVICE_NAME=pgadmin
|
|
||||||
|
|
||||||
|
|
||||||
source ${SCRIPT_PATH}/../common.shinc
|
|
||||||
|
|
||||||
#
|
|
||||||
# Project specific variables
|
|
||||||
#
|
|
||||||
|
|
||||||
DOMAIN_NAME="pgadmin.loc"
|
|
||||||
|
|
||||||
source ${SCRIPT_PATH}/env.shinc 2> /dev/null
|
|
||||||
|
|
||||||
|
|
||||||
init() {
|
|
||||||
__init
|
|
||||||
|
|
||||||
# Create networks
|
|
||||||
NETWORKS=(${DB_NETWORK} ${PROXY_NETWORK})
|
|
||||||
__createNetworks
|
|
||||||
|
|
||||||
docker create \
|
|
||||||
--name ${SERVICE_NAME} \
|
|
||||||
-e VIRTUAL_HOST=${DOMAIN_NAME} \
|
|
||||||
-e VIRTUAL_PORT=5050 \
|
|
||||||
-v pgadmin_data:/data \
|
|
||||||
--restart=unless-stopped \
|
|
||||||
${IMAGE_NAME}:${IMAGE_VERSION}
|
|
||||||
|
|
||||||
[[ $? -ne 0 ]] && return 1
|
|
||||||
|
|
||||||
docker network connect ${DB_NETWORK} ${SERVICE_NAME}
|
|
||||||
[[ $? -ne 0 ]] && return 1
|
|
||||||
|
|
||||||
docker network connect ${PROXY_NETWORK} ${SERVICE_NAME}
|
|
||||||
[[ $? -ne 0 ]] && return 1
|
|
||||||
|
|
||||||
__ask_to_start
|
|
||||||
}
|
|
||||||
|
|
||||||
"$@"
|
|
||||||
Loading…
Reference in New Issue
Block a user