Respect the git branch when creating a new repo in git:from-image #5601
Description
Description of problem
As the title says. After this, it becomes impossible to get the app back up again. And the only possible solution (that I am aware of) is to delete the app and recreate it.
Steps to reproduce
Here are steps to reproduce:
- Deployed an image using
git:from-image - Call
ps:stopon the app - Delete the image using
docker rmi dokku/appname
After this, trying to use git:from-image results in this:
-----> Generating build context
Setting Dockerfile
-----> Pulling image
postgresql-latest: Pulling from umami-software/umami
213ec9aee27d: Pull complete
90d4f1a52341: Pull complete
96f9ff3b94d8: Pull complete
f05a94b04b95: Pull complete
1ad3aa7ede17: Pull complete
6dfb7e91b6b2: Pull complete
a9af10b42156: Pull complete
b10fcae2b267: Pull complete
c59ccd95e24d: Pull complete
5f8296911c17: Pull complete
04b22ab9be02: Pull complete
fe1519ac8426: Pull complete
d48a9c15f3f8: Pull complete
db3077e17fc1: Pull complete
0d411b1c3a5f: Pull complete
Digest: sha256:60fa8875aff8309c04d7f9e194bcabc8431d7eb628d427c8e0acaad2bb3bdaf0
Status: Downloaded newer image for docker.umami.dev/umami-software/umami:postgresql-latest
docker.umami.dev/umami-software/umami:postgresql-latest
-----> Updating git repository with specified build context
! No changes detected, skipping git commit
! Call 'ps:rebuild' on app to rebuild the app from existing source
And ps:rebuild results in:
----> WARNING: Cannot build from 'main' as there are no commits stored at that branch.
! exit status 1
dokku report $APP_NAME
An example from the umami docker image that I deploy.
-----> uname: Linux main 5.15.0-58-generic #64-Ubuntu SMP Thu Jan 5 11:43:13 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
-----> memory:
total used free shared buff/cache available
Mem: 1927 720 147 90 1059 924
Swap: 2047 270 1777
-----> docker version:
Client: Docker Engine - Community
Version: 20.10.22
API version: 1.41
Go version: go1.18.9
Git commit: 3a2c30b
Built: Thu Dec 15 22:28:04 2022
OS/Arch: linux/amd64
Context: default
Experimental: true
Server: Docker Engine - Community
Engine:
Version: 20.10.22
API version: 1.41 (minimum version 1.12)
Go version: go1.18.9
Git commit: 42c8b31
Built: Thu Dec 15 22:25:49 2022
OS/Arch: linux/amd64
Experimental: false
containerd:
Version: 1.6.15
GitCommit: 5b842e528e99d4d4c1686467debf2bd4b88ecd86
runc:
Version: 1.1.4
GitCommit: v1.1.4-0-g5fd4c4d
docker-init:
Version: 0.19.0
GitCommit: de40ad0
-----> docker daemon info:
Client:
Context: default
Debug Mode: true
Plugins:
app: Docker App (Docker Inc., v0.9.1-beta3)
buildx: Docker Buildx (Docker Inc., v0.9.1-docker)
compose: Docker Compose (Docker Inc., v2.14.1)
scan: Docker Scan (Docker Inc., v0.23.0)
Server:
Containers: 28
Running: 28
Paused: 0
Stopped: 0
Images: 317
Server Version: 20.10.22
Storage Driver: overlay2
Backing Filesystem: extfs
Supports d_type: true
Native Overlay Diff: true
userxattr: false
Logging Driver: json-file
Cgroup Driver: systemd
Cgroup Version: 2
Plugins:
Volume: local
Network: bridge host ipvlan macvlan null overlay
Log: awslogs fluentd gcplogs gelf journald json-file local logentries splunk syslog
Swarm: inactive
Runtimes: runc io.containerd.runc.v2 io.containerd.runtime.v1.linux
Default Runtime: runc
Init Binary: docker-init
containerd version: 5b842e528e99d4d4c1686467debf2bd4b88ecd86
runc version: v1.1.4-0-g5fd4c4d
init version: de40ad0
Security Options:
apparmor
seccomp
Profile: default
cgroupns
Kernel Version: 5.15.0-58-generic
Operating System: Ubuntu 22.04.1 LTS
OSType: linux
Architecture: x86_64
CPUs: 2
Total Memory: 1.883GiB
Name: main
ID: 6TNP:PLPS:WU4B:N6TK:PLFP:VZNA:BAI4:AKEY:OV5V:SRAF:JBSW:HEFX
Docker Root Dir: /mnt/docker
Debug Mode: false
Registry: https://index.docker.io/v1/
Labels:
Experimental: false
Insecure Registries:
127.0.0.0/8
Live Restore Enabled: false
-----> git version: git version 2.34.1
-----> sigil version: 0.9.0build+bc921b7
-----> herokuish version:
herokuish: v0.5.40
buildpacks:
heroku-buildpack-multi v1.2.0
heroku-buildpack-ruby v244
heroku-buildpack-nodejs v202
heroku-buildpack-clojure v90
heroku-buildpack-python v223
heroku-buildpack-java v72
heroku-buildpack-gradle v38
heroku-buildpack-scala v96
heroku-buildpack-play v26
heroku-buildpack-php v227
heroku-buildpack-go v169
heroku-buildpack-nginx v22
buildpack-null v3
-----> dokku version: dokku version 0.29.3
-----> plugn version: plugn: 0.12.0build+3a27594
-----> dokku plugins:
00_dokku-standard 0.29.3 enabled dokku core standard plugin
20_events 0.29.3 enabled dokku core events logging plugin
app-json 0.29.3 enabled dokku core app-json plugin
apps 0.29.3 enabled dokku core apps plugin
builder 0.29.3 enabled dokku core builder plugin
builder-dockerfile 0.29.3 enabled dokku core builder-dockerfile plugin
builder-herokuish 0.29.3 enabled dokku core builder-herokuish plugin
builder-lambda 0.29.3 enabled dokku core builder-lambda plugin
builder-null 0.29.3 enabled dokku core builder-null plugin
builder-pack 0.29.3 enabled dokku core builder-pack plugin
buildpacks 0.29.3 enabled dokku core buildpacks plugin
caddy-vhosts 0.29.3 enabled dokku core caddy-vhosts plugin
certs 0.29.3 enabled dokku core certificate management plugin
checks 0.29.3 enabled dokku core checks plugin
clickhouse 0.18.0 enabled dokku clickhouse service plugin
common 0.29.3 enabled dokku core common plugin
config 0.29.3 enabled dokku core config plugin
cron 0.29.3 enabled dokku core cron plugin
docker-options 0.29.3 enabled dokku core docker-options plugin
domains 0.29.3 enabled dokku core domains plugin
edgedb 0.0.0 enabled dokku plugin for edgedb (https://edgedb.com)
enter 0.29.3 enabled dokku core enter plugin
git 0.29.3 enabled dokku core git plugin
letsencrypt 0.12.1 enabled Automated installation of let's encrypt TLS certificates
logs 0.29.3 enabled dokku core logs plugin
maintenance 0.7.2 enabled Maintenance mode for apps
network 0.29.3 enabled dokku core network plugin
nginx-max-upload-size 0.1.4 enabled Set the NGINX maximum upload file size
nginx-vhosts 0.29.3 enabled dokku core nginx-vhosts plugin
plugin 0.29.3 enabled dokku core plugin plugin
postgres 1.18.0 enabled dokku postgres service plugin
proxy 0.29.3 enabled dokku core proxy plugin
ps 0.29.3 enabled dokku core ps plugin
redis 1.19.0 enabled dokku redis service plugin
registry 0.29.3 enabled dokku core registry plugin
repo 0.29.3 enabled dokku core repo plugin
resource 0.29.3 enabled dokku core resource plugin
run 0.29.3 enabled dokku core run plugin
scheduler 0.29.3 enabled dokku core scheduler plugin
scheduler-docker-local 0.29.3 enabled dokku core scheduler-docker-local plugin
scheduler-null 0.29.3 enabled dokku core scheduler-null plugin
shell 0.29.3 enabled dokku core shell plugin
ssh-keys 0.29.3 enabled dokku core ssh-keys plugin
storage 0.29.3 enabled dokku core storage plugin
trace 0.29.3 enabled dokku core trace plugin
traefik-vhosts 0.29.3 enabled dokku core traefik-vhosts plugin
=====> umami app-json information
App json computed selected: app.json
App json global selected: app.json
App json selected:
=====> umami app information
App created at: 1672804910
App deploy source: umami
App deploy source metadata: umami
App dir: /home/dokku/umami
App locked: false
=====> umami builder information
Builder build dir:
Builder computed build dir:
Builder computed selected:
Builder global build dir:
Builder global selected:
Builder selected:
=====> umami builder-dockerfile information
Builder dockerfile computed dockerfile path: Dockerfile
Builder dockerfile global dockerfile path: Dockerfile
Builder dockerfile dockerfile path:
=====> umami builder-lambda information
Builder lambda computed lambdayml path: lambda.yml
Builder lambda global lambdayml path: lambda.yml
Builder lambda lambdayml path:
=====> umami builder-pack information
Builder pack computed projecttoml path: project.toml
Builder pack global projecttoml path: project.toml
Builder pack projecttoml path:
=====> umami buildpacks information
Buildpacks computed stack: gliderlabs/herokuish:latest-20
Buildpacks global stack:
Buildpacks list:
Buildpacks stack:
=====> umami ssl information
Ssl dir: /home/dokku/umami/tls
Ssl enabled: true
Ssl hostnames: umami.diptesh.me
Ssl expires at: Apr 4 03:04:30 2023 GMT
Ssl issuer: C = US, O = Let's Encrypt, CN = R3
Ssl starts at: Jan 4 03:04:31 2023 GMT
Ssl subject: subject=CN = umami.diptesh.me
Ssl verified: self signed
=====> umami checks information
Checks disabled list: none
Checks skipped list: none
Checks computed wait to retire: 60
Checks global wait to retire: 60
Checks wait to retire:
=====> umami cron information
Cron task count: 0
=====> umami docker options information
Docker options build: --link dokku.postgres.umami:dokku-postgres-umami
Docker options deploy: --link dokku.postgres.umami:dokku-postgres-umami --restart=on-failure:10
Docker options run: --link dokku.postgres.umami:dokku-postgres-umami
=====> umami domains information
Domains app enabled: true
Domains app vhosts: umami.diptesh.me
Domains global enabled: true
Domains global vhosts: diptesh.me
=====> umami git information
Git deploy branch: master
Git global deploy branch: main
Git keep git dir: false
Git rev env var: GIT_REV
Git sha: d90c4fc
Git source image: docker.umami.dev/umami-software/umami:postgresql-latest
Git last updated at:
=====> umami letsencrypt information
Letsencrypt active: true
Letsencrypt autorenew: true
Letsencrypt email:
Letsencrypt expiration: 1680577470
=====> umami logs information
Logs computed max size: 10m
Logs global max size: 10m
Logs global vector sink:
Logs max size:
Logs vector sink:
=====> umami maintenance information
Maintenance enabled: false
=====> umami network information
Network attach post create:
Network attach post deploy:
Network bind all interfaces: false
Network computed attach post create:
Network computed attach post deploy:
Network computed bind all interfaces: false
Network computed initial network:
Network computed tld:
Network global attach post create:
Network global attach post deploy:
Network global bind all interfaces: false
Network global initial network:
Network global tld:
Network initial network:
Network static web listener:
Network tld:
Network web listeners: 172.17.0.31:3000
=====> umami nginx information
Nginx access log format:
Nginx access log path: /var/log/nginx/umami-access.log
Nginx bind address ipv4:
Nginx bind address ipv6: ::
Nginx client max body size:
Nginx disable custom config: false
Nginx error log path: /var/log/nginx/umami-error.log
Nginx global hsts: true
Nginx computed hsts: true
Nginx hsts:
Nginx hsts include subdomains: true
Nginx hsts max age: 15724800
Nginx hsts preload: false
Nginx computed nginx conf sigil path: nginx.conf.sigil
Nginx global nginx conf sigil path: nginx.conf.sigil
Nginx nginx conf sigil path:
Nginx proxy buffer size: 4096
Nginx proxy buffering: on
Nginx proxy buffers: 8 4096
Nginx proxy busy buffers size: 8192
Nginx proxy read timeout: 60s
Nginx last visited at: 1674120741
Nginx x forwarded for value: $remote_addr
Nginx x forwarded port value: $server_port
Nginx x forwarded proto value: $scheme
Nginx x forwarded ssl:
=====> umami proxy information
Proxy enabled: true
Proxy port map: http:80:3000 https:443:3000
Proxy type: nginx
=====> umami ps information
Deployed: true
Processes: 1
Ps can scale: true
Ps computed procfile path: Procfile
Ps global procfile path: Procfile
Ps procfile path:
Ps restart policy: on-failure:10
Restore: true
Running: false
Status web 1: missing (CID: 5339cdb8437)
=====> umami registry information
Registry computed image repo: dokku/umami
Registry computed push on release: false
Registry computed server:
Registry global push on release:
Registry global server:
Registry image repo:
Registry push on release:
Registry server:
Registry tag version:
=====> umami resource information
=====> umami scheduler information
Scheduler computed selected: docker-local
Scheduler global selected: docker-local
Scheduler selected:
=====> umami scheduler-docker-local information
Scheduler docker local disable chown:
Scheduler docker local init process: true
Scheduler docker local parallel schedule count:
=====> umami storage information
Storage build mounts:
Storage deploy mounts:
Storage run mounts:
Additional information
No response
Output of failing commands after running: dokku trace:off
No response
Output of failing commands after running: dokku trace:on
No response