From 2e471cf6f9f4e67b8378fb24f6fe38f9d6ed1f17 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Sat, 18 Dec 2021 15:25:48 +0100 Subject: [PATCH] Docker: Rename photoprism/development to develop for consistency --- Makefile | 32 +++++++++++-------- cmd/photoprism/photoprism.go | 2 +- docker/{development => develop}/.my.cnf | 0 docker/{development => develop}/Dockerfile | 0 .../{development => develop}/armv7/Dockerfile | 0 docker/{development => develop}/entrypoint.sh | 0 .../keycloak/client.json | 2 +- .../keycloak/clients.json | 2 +- scripts/sql/init-test-databases.sql | 0 9 files changed, 21 insertions(+), 17 deletions(-) rename docker/{development => develop}/.my.cnf (100%) rename docker/{development => develop}/Dockerfile (100%) rename docker/{development => develop}/armv7/Dockerfile (100%) rename docker/{development => develop}/entrypoint.sh (100%) rename docker/{development => develop}/keycloak/client.json (98%) rename docker/{development => develop}/keycloak/clients.json (98%) delete mode 100755 scripts/sql/init-test-databases.sql diff --git a/Makefile b/Makefile index 46fb84a51..10a4b941d 100644 --- a/Makefile +++ b/Makefile @@ -44,15 +44,20 @@ fmt: fmt-js fmt-go upgrade: dep-upgrade-js dep-upgrade clean-local: clean-local-config clean-local-cache clean-install: clean-local dep build-js install-bin install-assets -dev: dev-npm dev-go-amd64 debug-go: build-go-remote start-debug -dev-npm: - $(info Upgrading NPM in local dev environment...) +upgrade-amd64: upgrade-npm upgrade-go-amd64 # Upgrades NPM & Go in local AMD64 dev environment +upgrade-arm64: upgrade-npm upgrade-go-arm64 # Upgrades NPM & Go in local ARM64 dev environment +upgrade-npm: + $(info Upgrading NPM in dev environment...) sudo npm update -g npm -dev-go-amd64: - $(info Installing Go in local AMD64 dev environment...) +upgrade-go-amd64: + $(info Upgrading Go in AMD64 dev environment...) sudo docker/scripts/install-go.sh amd64 go build -v ./... +upgrade-go-arm64: + $(info Upgrading Go in ARM64 dev environment...) + sudo docker/scripts/install-go.sh arm64 + go build -v ./... acceptance-restart: cp -f storage/acceptance/backup.db storage/acceptance/index.db cp -f storage/acceptance/config/settingsBackup.yml storage/acceptance/config/settings.yml @@ -222,22 +227,21 @@ clean: rm -rf storage/backup rm -rf storage/cache rm -rf frontend/node_modules -docker-development: +docker-develop: docker pull --platform=amd64 ubuntu:21.10 docker pull --platform=arm64 ubuntu:21.10 - scripts/docker/multiarch.sh development linux/amd64,linux/arm64 $(DOCKER_TAG) + scripts/docker/multiarch.sh develop linux/amd64,linux/arm64 $(DOCKER_TAG) docker-preview: scripts/docker/multiarch.sh photoprism linux/amd64,linux/arm64 docker-release: scripts/docker/multiarch.sh photoprism linux/amd64,linux/arm64 $(DOCKER_TAG) -docker-armv7-development: - docker pull --platform=arm ubuntu:21.10 - scripts/docker/arch.sh development linux/arm armv7 /armv7 -docker-armv7-preview: - docker pull --platform=arm photoprism/development:armv7 +armv7-develop: + scripts/docker/arch.sh develop linux/arm armv7 /armv7 +armv7-preview: + docker pull --platform=arm photoprism/develop:armv7 scripts/docker/arch.sh photoprism linux/arm armv7-preview /armv7 -docker-armv7-release: - docker pull --platform=arm photoprism/development:armv7 +armv7-release: + docker pull --platform=arm photoprism/develop:armv7 scripts/docker/arch.sh photoprism linux/arm armv7 /armv7 docker-local: scripts/docker/build.sh photoprism diff --git a/cmd/photoprism/photoprism.go b/cmd/photoprism/photoprism.go index b57555752..c7d1e1358 100644 --- a/cmd/photoprism/photoprism.go +++ b/cmd/photoprism/photoprism.go @@ -39,7 +39,7 @@ import ( "github.com/urfave/cli" ) -var version = "development" +var version = "develop" var log = event.Log func main() { diff --git a/docker/development/.my.cnf b/docker/develop/.my.cnf similarity index 100% rename from docker/development/.my.cnf rename to docker/develop/.my.cnf diff --git a/docker/development/Dockerfile b/docker/develop/Dockerfile similarity index 100% rename from docker/development/Dockerfile rename to docker/develop/Dockerfile diff --git a/docker/development/armv7/Dockerfile b/docker/develop/armv7/Dockerfile similarity index 100% rename from docker/development/armv7/Dockerfile rename to docker/develop/armv7/Dockerfile diff --git a/docker/development/entrypoint.sh b/docker/develop/entrypoint.sh similarity index 100% rename from docker/development/entrypoint.sh rename to docker/develop/entrypoint.sh diff --git a/docker/development/keycloak/client.json b/docker/develop/keycloak/client.json similarity index 98% rename from docker/development/keycloak/client.json rename to docker/develop/keycloak/client.json index 38f22302c..9f9fa7f68 100644 --- a/docker/development/keycloak/client.json +++ b/docker/develop/keycloak/client.json @@ -1,5 +1,5 @@ { - "clientId": "photoprism-development", + "clientId": "photoprism-develop", "secret": "9d8351a0-ca01-4556-9c37-85eb634869b9", "name": "PhotoPrism", "rootUrl": "https://photoprism.traefik.net/", diff --git a/docker/development/keycloak/clients.json b/docker/develop/keycloak/clients.json similarity index 98% rename from docker/development/keycloak/clients.json rename to docker/develop/keycloak/clients.json index d3c6f29ef..bad04f84f 100644 --- a/docker/development/keycloak/clients.json +++ b/docker/develop/keycloak/clients.json @@ -1,7 +1,7 @@ { "clients": [ { - "clientId": "photoprism-development", + "clientId": "photoprism-develop", "secret": "9d8351a0-ca01-4556-9c37-85eb634869b9", "name": "PhotoPrism", "rootUrl": "https://photoprism.traefik.net/", diff --git a/scripts/sql/init-test-databases.sql b/scripts/sql/init-test-databases.sql deleted file mode 100755 index e69de29bb..000000000