Skip to content

Commit

Permalink
Merge branch 'release/2.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dwenzel committed Sep 14, 2022
2 parents 0b63179 + 64306db commit 4505d0a
Show file tree
Hide file tree
Showing 5 changed files with 125 additions and 36 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/publishDockerImage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# GitHub recommends pinning actions to a commit SHA.
# To get a newer version, you will need to update the SHA.
# You can also reference a tag or branch, but the action may change without warning.

name: Publish Docker image to hub.docker.com

on:
release:
types: [published]

jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3

- name: Log in to Docker Hub
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
username: ${{ secrets.DOCKER_USER_NAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: cpsit/deploy-typo3-capistrano

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
50 changes: 50 additions & 0 deletions .github/workflows/publishToGithubRegistry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# GitHub recommends pinning actions to a commit SHA.
# To get a newer version, you will need to update the SHA.
# You can also reference a tag or branch, but the action may change without warning.

name: Create and publish a Docker image to Github Registry

on:
push:
branches: ['release']

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
26 changes: 0 additions & 26 deletions .gitlab-ci.yml

This file was deleted.

27 changes: 27 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
2022-09-14 [RELEASE] Release of deploy-typo3-capistrano 2.1.0 (Dirk Wenzel)
2022-09-14 3eaf086 [CI] reset deployment rule for docker hub (Dirk Wenzel)
2022-09-14 6df3ad6 [CI] test deployment to docker hub (Dirk Wenzel)
2022-09-14 abed37a [TASK] temporarily enable action for current branch (Dirk Wenzel)
2022-09-14 952c000 [TASK] internal references and configuration removed (Dirk Wenzel)
2022-09-14 9b796a9 Update .github/workflows/publishToGithubRegistry.yaml (Dirk Wenzel)
2022-09-14 c983637 Update README.md (Dirk Wenzel)
2022-09-14 24838e8 [CI] config file moved to proper folder (Dirk Wenzel)
2022-09-14 33cf062 [CI] configuration for publishing of docker image added (Dirk Wenzel)
2022-05-06 b54c578 [RELEASE] Release of deploy-typo3-capistrano 2.0.0 (Elias Häußler)
2022-04-25 0d53df2 [DOCS] Add migration steps to README.md (Elias Häußler)
2022-04-25 8a529c2 [TASK] Update to dkdeploy-typo3-cms 8.1.x (Elias Häußler)
2022-04-25 565aa18 [RELEASE] Release of deploy-typo3-capistrano 1.0.4 (Elias Häußler)
2022-04-25 0886306 [DOCS] Mention replacement for legacy image on Docker Hub (Elias Häußler)
2022-04-25 d95b311 [DOCS] Document available tags in README.md (Elias Häußler)
2022-04-25 7e254a9 [RELEASE] Release of deploy-typo3-capistrano 1.0.3 (Elias Häußler)
2022-04-25 7dafde0 [DOCS] Add hint about patched version of Capistrano (Elias Häußler)
2022-04-25 1b7eb70 [BUGFIX] Include patch to avoid "can't dump IO" errors (Elias Häußler)
2022-04-25 6d46777 [TASK] Create Docker image tag in feature branches (Elias Häußler)
2022-04-25 591430d [BUGFIX] Correct requirements section in README.md (Elias Häußler)
2022-04-25 9296767 [RELEASE] Release of deploy-typo3-capistrano 1.0.2 (Elias Häußler)
2022-04-25 2b28fdc [BUGFIX] Write Docker image in lowercase letters (Elias Häußler)
2022-04-25 59253ef [RELEASE] Release of deploy-typo3-capistrano 1.0.1 (Elias Häußler)
2022-04-25 cb152b9 [TASK] Release image tags for repository tags as well (Elias Häußler)
2022-04-25 a1fc6d2 [DOCS] Reflect project move to GitLab in README.md (Elias Häußler)
2022-04-25 c3e28a3 [TASK] Add GitLab CI config (Elias Häußler)

2022-05-06 [RELEASE] Release of deploy-typo3-capistrano 2.0.0 (Elias Häußler)
2022-04-25 0d53df2 [DOCS] Add migration steps to README.md (Elias Häußler)
2022-04-25 8a529c2 [TASK] Update to dkdeploy-typo3-cms 8.1.x (Elias Häußler)
Expand Down
16 changes: 6 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
> Docker image for deployment of TYPO3 CMS applications via Capistrano, based on
> [`dkdeploy-typo3-cms`][4].
:warning: This is a replacement for the legacy [`cpsit/deploy-typo3-capistrano`][3]
image on Docker Hub.

## What does it do?

This package provides a Docker image with preinstalled Capistrano for TYPO3.
Expand All @@ -14,15 +11,15 @@ for all included packages.

## Requirements

You need to provide a Capistrano deployment config. See our [deployment package][1]
for an example configuration.
You need to provide a Capistrano deployment config. See [capistrano documentation][1]
for details.

## Usage

Reference the Docker image in your `.gitlab-ci.yml` like follows:
Reference the Docker image in your CI/CD pipeline e.g.:

```yaml
image: $CI_REGISTRY/devops/docker-images/deploy-typo3-capistrano:stable
image: cpsit/deploy-typo3-capistrano:stable
```
Now run `cap [target] [task]` to start the deployment.
Expand All @@ -41,7 +38,7 @@ The following image tags are available:
## Important notes

The delivered version of Capistrano is patched to avoid random `can't dump IO`
errors. See the corresponding [merge request][2] that introduced this patch.
errors.

## Migration

Expand All @@ -55,7 +52,6 @@ errors. See the corresponding [merge request][2] that introduced this patch.
folders with the old name schema are removed. This happens automatically
during the `deploy:cleanup` task.

[1]: https://gitlab.321.works/DevOps/templates/backend/deployment
[2]: https://gitlab.321.works/DevOps/docker-images/deploy-typo3-capistrano/-/merge_requests/2
[1]: https://capistranorb.com/
[3]: https://hub.docker.com/r/cpsit/deploy-typo3-capistrano
[4]: https://github.com/dkdeploy/dkdeploy-typo3-cms

0 comments on commit 4505d0a

Please sign in to comment.