Commit Graph
38 Commits
Author SHA1 Message Date
Jose Diaz-Gonzalez 33e559adf6 fix: correct issues in linting 2025-08-11 22:44:17 -04:00
Jose Diaz-Gonzalez 38b04d92bd fix: install netcat-traditional in 24.04 image 2024-10-20 23:58:32 -04:00
Jose Diaz-Gonzalez 83960e51a2 Merge pull request #7280 from dokku/merge-upstream-image-check
Merge changes from digitialocean's image-check script
2024-10-19 04:02:20 -04:00
Jose Diaz-Gonzalez cb0b47bcd4 chore: merge changes from digitialocean's image-check script
This includes changes up to May 2, 2024 from this link: https://github.com/digitalocean/marketplace-partners/commits/master/scripts/99-img-check.sh
2024-10-19 00:57:12 -04:00
Jose Diaz-Gonzalez cdb188d7c8 fix: allow exit code 2 when waiting for cloud-init to complete
A change in cloud-init and/or the Ubuntu image provided by Digitalocean causes builds to fail due to cloud-init status exiting 2. The error is ignorable.

See digitalocean/marketplace-partners#186 for more details.
2024-10-19 00:55:41 -04:00
Jose Diaz-Gonzalez fb335107f6 feat: upgrade digitalocean image to Ubuntu Noble 2024-09-21 20:45:48 -04:00
Jose Diaz-Gonzalez 4a1a2a326a feat: migrate away from transitional packages
Several of the packages being installed were actually transitional packages, that is, the package itself is either a complete no-op (since the package is already installed), or else the package only exists to depend on another package of a new name (to support people who are running older operating systems).

For the former, we can drop the dependency entirely, and for the latter we should use the new package name directly.
2024-03-26 17:19:41 -04:00
Jose Diaz-Gonzalez 5148600ea0 chore: remove systemd reverse dependency by dropping software-properties-common
Through some random machinations, software-properties-common now has a dependency on systemd. This breaks the built docker image as plugins will think systemd is available, so `dokku plugin:install --core` will reference that over sv.

Since we don't manage ppas in Dokku anymore - the only use was for an nginx ppa so we could use a newer Nginx - this can be safely removed.

Also remove some other stuff related to systemd that aren't required anymore.
2024-03-06 10:59:42 -05:00
Jose Diaz-Gonzalez 28532a56a9 tests: fix issue where CI cannot install docker-buildx-plugin 2024-02-05 14:59:20 -05:00
Jose Diaz-Gonzalez 859b87fadd fix: remove more references to ubuntu bionic 2023-10-15 20:21:44 -04:00
Jose Diaz-Gonzalez 89109a33b3 fix: correct package for container healthchecker when building digitalocean image 2023-08-19 19:06:42 -04:00
Jose Diaz-Gonzalez 26e9cc9b8c feat: add support for non-web healthchecks via app.json
This change converts existing CHECKS files into a healthchecks key that is understood by 'docker-container-healthchecker'. This tool supports a number of different types of container healthchecks - command, http, uptime - and can perform healthchecks against non-web processes.

The use of the old CHECKS file is now deprecated, and will be removed in the next minor version. Users can use the 'docker-container-healthchecker' to convert existing CHECKS files to the new format automatically.

Closes #2760
2023-08-06 17:23:13 -04:00
Jose Diaz-Gonzalez dac566e75e refactor: move all shellcheck disable definitions to .shellcheckrc file
This makes standard use of shellcheck work without needing to provide extra configuration anywhere.

Also remove use of inline 'shellcheck disable' calls that are already defined in the .shellcheckrc and don't need to be set inline.
2023-08-05 10:58:57 -04:00
Jose Diaz-Gonzalez 4b8ccfbf34 fix: implement checkTMP 2023-02-16 16:22:32 -05:00
Jose Diaz-Gonzalez 26a536bc9b feat: log the output of the do directory 2023-02-16 16:01:59 -05:00
Jose Diaz-Gonzalez 635f9c1bc5 chore: remove unused function 2023-02-16 15:49:37 -05:00
Jose Diaz-Gonzalez 47fddf1899 chore: remove extra cleanup line
Logs are already zero'd out
2023-02-16 15:49:16 -05:00
Jose Diaz-Gonzalez 7b1a2fa908 fix: add missing cleanup step 2023-02-16 15:49:02 -05:00
Jose Diaz-Gonzalez 1eada6a5e8 fix: purge log files and droplet-agent
This should fix a few of the warnings/errors shown during the image check process.
2023-02-16 15:32:55 -05:00
Jose Diaz-Gonzalez f1152cd6b7 fix: validate the packer image 2023-02-16 15:10:49 -05:00
Jose Diaz-Gonzalez 55c3b73f35 feat: run image check at the end of the build 2023-02-16 15:10:43 -05:00
Jose Diaz-Gonzalez 1eda16d186 refactor: simplify provisioning 2023-02-16 15:08:49 -05:00
Jose Diaz-Gonzalez b2fbefb6d3 refactor: remove use of format function 2023-02-16 15:07:58 -05:00
Jose Diaz-Gonzalez 11743afbf0 chore: drop ability to set a custom base image
We'll only ever test against the latest LTS.
2023-02-16 15:07:25 -05:00
Jose Diaz-Gonzalez d40ee36348 feat: update all base packages 2023-02-16 15:07:03 -05:00
Jose Diaz-Gonzalez c24e0d3888 feat: ensure we have a custom landing page for folks to view when going to their droplet ip/vhost 2023-02-16 15:00:37 -05:00
Jose Diaz-Gonzalez 360940f68e fix: use https urls 2023-02-16 14:53:58 -05:00
Jose Diaz-Gonzalez 4ce5ba6a75 refactor: unify cleanup script with the one used by the DO marketplace 2023-02-16 14:50:07 -05:00
Jose Diaz-Gonzalez 197bd0c864 feat: remove the default nginx site in built images
This is confusing for users and shouldn't really ever exist.
2023-02-16 14:49:13 -05:00
Jose Diaz-Gonzalez ba06bac1b9 feat: enable exit on error 2023-02-16 14:48:43 -05:00
Jose Diaz-Gonzalez 9dc6d8e130 refactor: cleanup ufw rules
- use nginx ful rules
- limit ssh by default
- force enable ufw
- drop access to 2375 and 2376 (this allows passwordless docker access...)
2023-02-16 14:47:52 -05:00
Jose Diaz-Gonzalez afe042de46 docs: cleanup motd
- standardize text with the sample marketplace app
- remove reference to web server (its unavailable in newer versions)
2023-02-16 14:46:39 -05:00
Jose Diaz-Gonzalez 358fb72baf fix: run build in nyc1
NYC1 is the only DC where the smallest size droplet is available.
2023-02-16 14:33:26 -05:00
Jose Diaz-Gonzalez 98d6a3b53e fix: run build on smallest image
This will allow anyone to use the resulting image, and not just those with at least 2GB of ram.
2023-02-16 14:32:30 -05:00
Jose Diaz-Gonzalez ba56474f15 fix: correct position of post-provisioner block 2023-02-16 14:26:29 -05:00
Jose Diaz-Gonzalez ec642788d3 fix: correct SC2004 2023-02-16 14:25:40 -05:00
Jose Diaz-Gonzalez adf98b53f5 chore: run shfmt 2023-02-16 14:22:44 -05:00
Jose Diaz-Gonzalez 96c737eae4 refactor: update digitalocean image building to match what Digitalocean does
The scripts run/installed on the server are based on what was given to me by Digitalocean in 2019, so they may have diverged a bit since.
2023-02-16 14:19:10 -05:00