Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Keep hub.docker.com repositories updated, fixes #5847 [skip ci] #6032

Merged
merged 32 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a9cdb58
Add ddev-webserver README per template
rfay Mar 29, 2024
ae459b9
initial goreleaser experiment [skip ci]
rfay Mar 29, 2024
f3c90dd
need images tag in goreleaser [skip ci]
rfay Mar 29, 2024
a586b2a
Try dockerhub instead of dockerhubs [skip ci]
rfay Mar 29, 2024
a67b902
it's not in current stable, just in nightly
rfay Mar 29, 2024
57e422e
dockerhubs->dockerhub
rfay Mar 30, 2024
6a3d450
better secret name
rfay Mar 30, 2024
0d45cc9
use literal dockerhub username
rfay Mar 30, 2024
ac9a49b
run with verbose
rfay Mar 30, 2024
91f731e
Set up tmate properly
rfay Mar 30, 2024
cb53153
Move dockerhub stuff to top for debugging
rfay Mar 30, 2024
9318536
REVERT THIS: run on workflow dispatch
rfay Mar 30, 2024
8d4eead
Add ddev-ssh-agent and template
rfay Apr 2, 2024
4114da5
Try more
rfay Apr 2, 2024
60b8011
Switch org to ddev
rfay Apr 2, 2024
4755007
Switch back to ddevhq org
rfay Apr 2, 2024
2f98ed0
dummy commit
rfay Apr 2, 2024
1fc7598
Revert "REVERT THIS: run on workflow dispatch" [skip ci]
rfay Apr 2, 2024
fac4b32
Switch back to ddev org [skip ci]
rfay Apr 2, 2024
f951614
extend READMEs for ddev-php-base, ddev-dbserver [skip ci]
rfay Apr 2, 2024
027f54e
routers and ddev-webserver
rfay Apr 2, 2024
a1da296
Add test-ssh-server
rfay Apr 2, 2024
4c2d689
Add ddev-gitpod-base
rfay Apr 2, 2024
f6c2ea7
Add mysql-arm64-images
rfay Apr 2, 2024
87889d3
Add arch-aur-builder
rfay Apr 2, 2024
c224baf
Add ddev-utilities
rfay Apr 2, 2024
af65762
Clean up broken template failures
rfay Apr 2, 2024
759b8d2
use correct image for mysql
rfay Apr 2, 2024
c538eb0
Remove another template marker
rfay Apr 2, 2024
d42acaf
dummy commit [skip ci]
rfay Apr 2, 2024
ee11366
Move back to latest goreleaser as v1.25.0 released [skip ci]
rfay Apr 3, 2024
7a3fbf2
Apply suggestions from code review
rfay Apr 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 59 additions & 0 deletions .circleci/README.arch-aur-builder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# arch-aur-builder docker image

## Overview

This obsolete image was once used for pushing DDEV releases to AUR. It is no longer used, as we use goreleaser now.

## Instructions

This can be pushed with

```bash
cat aur-checker-Dockerfile | docker buildx build --push --platform linux/amd64 -t "ddev/arch-aur-builder:latest" -
```
`
- Edit PKGBUILD to change the version and hash or anything else
- Then run it with

```bash
# docker run --rm --mount type=bind,source=$(pwd),target=/tmp/ddev-bin --workdir=/tmp/ddev-bin ddev/arch-aur-builder bash -c "makepkg --printsrcinfo > .SRCINFO && makepkg -s"
```

- Then `git add -u` and commit and push


## Source:

[https://github.com/ddev/ddev/tree/master/.circleci/aur-checker-Dockerfile](https://github.com/ddev/ddev/tree/master/.circleci/aur-checker-Dockerfile)

## Maintained by:

The [DDEV Docker Maintainers](https://github.com/ddev)

## Where to get help:

* [DDEV Community Discord](https://discord.gg/5wjP76mBJD)
* [Stack Overflow](https://stackoverflow.com/questions/tagged/ddev)

## Where to file issues:

https://github.com/ddev/ddev/issues

## Documentation:

* https://ddev.readthedocs.io/
* https://ddev.com/

## What is DDEV?

[DDEV](https://github.com/ddev/ddev) is an open source tool for launching local web development environments in minutes. It supports PHP, Node.js, and Python (experimental).

These environments can be extended, version controlled, and shared, so you can take advantage of a Docker workflow without Docker experience or bespoke configuration. Projects can be changed, powered down, or removed as easily as they’re started.

## License

View [license information](https://github.com/ddev/ddev/blob/master/LICENSE) for the software contained in this image.

As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).

As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.
13 changes: 10 additions & 3 deletions .github/workflows/master-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ on:
release:
types: [ created ]
workflow_dispatch:
inputs:
debug_enabled:
description: 'Run the build with tmate set "debug_enabled"'
type: boolean
required: false
default: false

env:
BUILDKIT_PROGRESS: plain
Expand All @@ -17,6 +23,8 @@ env:
GITHUB_REPOSITORY_OWNER: ${{ secrets.GITHUB_REPOSITORY_OWNER }}
DDEV_WINDOWS_SIGN: ${{ secrets.DDEV_WINDOWS_SIGN }}
HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

jobs:
build-most:
Expand Down Expand Up @@ -168,13 +176,11 @@ jobs:
CHOCOLATEY_API_KEY: ${{ secrets.CHOCOLATEY_API_KEY }}

steps:
# The upload-artifacts section often fails. This may give us a recovery technique
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
timeout-minutes: 45
with:
limit-access-to-actor: true
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}

- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -224,6 +230,7 @@ jobs:
version: latest
args: release --clean
env:
DOCKER_ORG: ddev
GITHUB_TOKEN: ${{ secrets.DDEV_GITHUB_TOKEN }}
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
FURY_ACCOUNT: ${{ secrets.FURY_ACCOUNT }}
Expand Down
63 changes: 63 additions & 0 deletions .gitpod/images/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# ddev-gitpod-base docker image

## Overview

ddev/ddev-gitpod-base is a base image for Gitpod integration with [DDEV](https://github.com/ddev/ddev).

Details about how it is used are in https://ddev.readthedocs.io/en/stable/users/install/ddev-installation/#gitpod

### Features

All the packages you expect to find to use DDEV on gitpod.

## Instructions

Use [DDEV on Gitpod](https://ddev.readthedocs.io/en/stable/users/install/ddev-installation/#gitpod)

### Building and pushing to Docker Hub

Use [push.sh](https://github.com/ddev/ddev/blob/master/.gitpod/images/push.sh)

### Running

To run the container by itself:

```bash
docker run -it --rm ddev/ddev-gitpod-base:<tag> bash
```

## Source:

[https://github.com/ddev/ddev/blob/master/.gitpod/images/Dockerfile](https://github.com/ddev/ddev/blob/master/.gitpod/images/Dockerfile)

## Maintained by:

The [DDEV Docker Maintainers](https://github.com/ddev)

## Where to get help:

* [DDEV Community Discord](https://discord.gg/5wjP76mBJD)
* [Stack Overflow](https://stackoverflow.com/questions/tagged/ddev)

## Where to file issues:

https://github.com/ddev/ddev/issues

## Documentation:

* https://ddev.readthedocs.io/
* https://ddev.com/

## What is DDEV?

[DDEV](https://github.com/ddev/ddev) is an open source tool for launching local web development environments in minutes. It supports PHP, Node.js, and Python (experimental).

These environments can be extended, version controlled, and shared, so you can take advantage of a Docker workflow without Docker experience or bespoke configuration. Projects can be changed, powered down, or removed as easily as they’re started.

## License

View [license information](https://github.com/ddev/ddev/blob/master/LICENSE) for the software contained in this image.

As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).

As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.
131 changes: 131 additions & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -366,3 +366,134 @@ furies:
- account: "{{ .Env.FURY_ACCOUNT }}"
secret_name: "FURY_TOKEN"
skip: '{{ ne .Prerelease "" }}'


dockerhub:

#arch-aur-builder
- images:
- '{{ .Env.DOCKER_ORG }}/arch-aur-builder'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: Arch push helper (obsolete)
full_description:
from_file:
path: ./.circleci/README.arch-aur-builder.md

# ddev-dbserver
- images:
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-5.5'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.0'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.1'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.2'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.3'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.4'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.5'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.6'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.7'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.8'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mariadb-10.11'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mysql-5.5'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mysql-5.6'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mysql-5.7'
- '{{ .Env.DOCKER_ORG }}/ddev-dbserver-mysql-8.0'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: DDEV's ddev-dbserver image
full_description:
from_file:
path: ./containers/ddev-dbserver/README.md


#ddev-gitpod-base
- images:
- '{{ .Env.DOCKER_ORG }}/ddev-gitpod-base'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: Gitpod integration for DDEV
full_description:
from_file:
path: ./.gitpod/images/README.md

#ddev-nginx-proxy-router
- images:
- '{{ .Env.DOCKER_ORG }}/ddev-nginx-proxy-router'
- '{{ .Env.DOCKER_ORG }}/ddev-router'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: DDEV's DEPRECATED ddev-nginx-proxy-router
full_description:
from_file:
path: ./containers/ddev-nginx-proxy-router/README.md

#ddev-php-base
- images:
- '{{ .Env.DOCKER_ORG }}/ddev-php-base'
- '{{ .Env.DOCKER_ORG }}/ddev-php-prod'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: DDEV's ddev-php-base image, base image for ddev-webserver
full_description:
from_file:
path: ./containers/ddev-php-base/README.md

#ddev-ssh-agent
- images:
- '{{ .Env.DOCKER_ORG }}/ddev-ssh-agent'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: DDEV's ddev-ssh-agent image
full_description:
from_file:
path: ./containers/ddev-ssh-agent/README.md

#ddev-traefik-router
- images:
- '{{ .Env.DOCKER_ORG }}/ddev-traefik-router'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: DDEV's ddev-traefik-router, a wrapper on traefik
full_description:
from_file:
path: ./containers/ddev-traefik-router/README.md

#ddev-utilities
- images:
- '{{ .Env.DOCKER_ORG }}/ddev-utilities'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: Utility provider for jq, base64, etc
full_description:
from_url:
url: https://github.com/ddev/ddev-utilities/raw/main/README.md

#ddev-webserver
- images:
- '{{ .Env.DOCKER_ORG }}/ddev-webserver'
- '{{ .Env.DOCKER_ORG }}/ddev-webserver-prod'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: DDEV's ddev-webserver image
full_description:
from_file:
path: ./containers/ddev-webserver/README.md

#mysql == mysql-arm64-images
- images:
- '{{ .Env.DOCKER_ORG }}/mysql'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: ARM64 base images for ddev-dbserver-mysql-8.0 and 5.7
full_description:
from_url:
url: https://github.com/ddev/mysql-arm64-images/raw/main/README.md

#test-ssh-server
- images:
- '{{ .Env.DOCKER_ORG }}/test-ssh-server'
username: '{{ .Env.DOCKERHUB_USERNAME }}'
secret_name: "DOCKERHUB_TOKEN"
description: DDEV's test-ssh-server image, used only for automated tests
full_description:
from_file:
path: ./containers/test-ssh-server/README.md
68 changes: 61 additions & 7 deletions containers/ddev-dbserver/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,64 @@
# ddev-dbserver for ddev
# ddev-dbserver docker image

This Docker image builds database server images (MariaDB and MySQL) for DDEV.
## Overview

Docker container image for DDEV's ddev-dbserver container. This same code is used to build all of the MariaDB and MySQL images.

This container image is part of DDEV, and not typically used stand-alone.

### Features

* MariaDB 5.5 though current stable
* MySQL 5.5 through current stable
* Backup facilities like xtrabackup and mariabackup.

## Instructions

Use [DDEV](https://ddev.readthedocs.io)

### Building and pushing to Docker Hub

See [DDEV docs](https://ddev.readthedocs.io/en/stable/developers/release-management/#pushing-docker-images-with-the-github-actions-workflow)

### Running
To run the container by itself:

```bash
docker run -it --rm --entrypoint=bash ddev/ddev-webserver:v1.22.7 bash
```
rfay marked this conversation as resolved.
Show resolved Hide resolved
make container
make push
make push VERSION=someversion
make clean
```

## Source:

[https://github.com/ddev/ddev/tree/master/containers/ddev-dbserver](https://github.com/ddev/ddev/tree/master/containers/ddev-dbserver)

## Maintained by:

The [DDEV Docker Maintainers](https://github.com/ddev)

## Where to get help:

* [DDEV Community Discord](https://discord.gg/5wjP76mBJD)
* [Stack Overflow](https://stackoverflow.com/questions/tagged/ddev)

## Where to file issues:

https://github.com/ddev/ddev/issues

## Documentation:

* https://ddev.readthedocs.io/
* https://ddev.com/

## What is DDEV?

[DDEV](https://github.com/ddev/ddev) is an open source tool for launching local web development environments in minutes. It supports PHP, Node.js, and Python (experimental).

These environments can be extended, version controlled, and shared, so you can take advantage of a Docker workflow without Docker experience or bespoke configuration. Projects can be changed, powered down, or removed as easily as they’re started.

## License

View [license information](https://github.com/ddev/ddev/blob/master/LICENSE) for the software contained in this image.

As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).

As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.