Skip to content

Commit

Permalink
v0.13.7-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
JourneyOver committed Sep 8, 2024
1 parent ce21ebc commit 48f0c4b
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cargo-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
pull_request:
types: [opened, reopened]
branches: [main, develop]

env:
CARGO_TERM_COLOR: always

Expand All @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@main
- name: Check
run: cargo check
- name: Clippy
Expand Down
20 changes: 9 additions & 11 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@ on:
workflows: ["Github Release"]
types: [completed]
branches: [main]
schedule:
- cron: '40 05 * * *'

env:
# Use docker.io for Docker Hub if empty
REGISTRY: ghcr.io
DOCKER_REGISTRY: tmknight88
DOCKER_REGISTRY: journeyover
# name of image
IMAGE: docker-autoheal
# github.repository as <account>/<repo>
IMAGE_NAME: tmknight/docker-autoheal
IMAGE_NAME: JourneyDocker/docker-autoheal
# Build args
CONTEXT: .
DISTRO: alpine
Expand All @@ -44,24 +42,24 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@main

# Setup QEMU for multi-arch
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@master
with:
platforms: amd64,arm64

# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@master

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
id: container-registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
uses: docker/login-action@master
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -70,7 +68,7 @@ jobs:
- name: Log into Docker Hub
id: docker-hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
uses: docker/login-action@master
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -79,7 +77,7 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@master
with:
images: |
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE }}
Expand All @@ -94,7 +92,7 @@ jobs:
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v5
uses: docker/build-push-action@master
with:
context: ${{ env.CONTEXT }}
platforms: linux/amd64,linux/arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/get-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
pkg-version: ${{ steps.pkg-version.outputs.PKG_VERSION }}
steps:
- name: "Checkout repository"
uses: actions/checkout@v4
uses: actions/checkout@main
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
# name of image
IMAGE: docker-autoheal
# github.repository as <account>/<repo>
IMAGE_NAME: tmknight/docker-autoheal
IMAGE_NAME: JourneyDocker/docker-autoheal
# Build args
CONTEXT: .
DISTRO: alpine
Expand All @@ -31,10 +31,10 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout repository"
uses: actions/checkout@v4
uses: actions/checkout@main

- name: "Create draft release"
uses: "taiki-e/create-gh-release-action@v1"
uses: taiki-e/create-gh-release-action@main
with:
# (optional) Path to changelog.
changelog: CHANGELOG.md
Expand Down Expand Up @@ -65,10 +65,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: "Checkout repository"
uses: actions/checkout@v4
uses: actions/checkout@main

- name: "Upload assets"
uses: "taiki-e/upload-rust-binary-action@v1"
uses: taiki-e/upload-rust-binary-action@main
with:
bin: ${{ env.IMAGE }}
target: ${{ matrix.target }}
Expand All @@ -79,13 +79,13 @@ jobs:
publish-release:
name: "Publish release"
if: ${{ github.event.workflow_run.conclusion == 'success' }}
needs:
needs:
- "get-version"
- "upload-assets"
runs-on: "ubuntu-latest"
steps:
- name: "Checkout repository"
uses: actions/checkout@v4
uses: actions/checkout@main

- name: "Release draft"
run: gh release edit ${{ needs.get-version.outputs.pkg-version }} --draft=false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
needs: get-version
steps:
- name: "Check out the repo"
uses: actions/checkout@v4
uses: actions/checkout@main
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## [Unreleased]

## 0.13.7-fix

### Changed

- Forked and added tzdata to the docker container because someone thinks it's not an issue for the `Docker Timezone` even though literally every comment out there on the internet says that tzdata needs to be added to alpine to make the timezone changing work correctly.

## 0.13.7

### Changed
Expand Down Expand Up @@ -117,7 +123,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## 0.10.0

There are several breaking changes; please read carefully and refer to [README](https://github.com/tmknight/docker-autoheal/blob/main/README.md) for more details
There are several breaking changes; please read carefully and refer to [README](https://github.com/JourneyDocker/docker-autoheal/blob/main/README.md) for more details

### Added

Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "docker-autoheal"
version = "0.13.7"
authors = ["Travis M Knight"]
version = "0.13.7-fix"
authors = ["Journey Over ,Travis M Knight"]
license = "GPL-3.0"
description = "A cross-platform tool to monitor and remediate unhealthy Docker containers"
readme = "README.md"
homepage = "https://github.com/tmknight/docker-autoheal"
homepage = "https://github.com/JourneyDocker/docker-autoheal"
edition = "2021"
rust-version = "1.74"

Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ docker run -d --read-only \
--env="AUTOHEAL_LOG_PERSIST=true" \
--volume=/var/run/docker.sock:/var/run/docker.sock:ro \
--volume=/opt/docker-autoheal/log.json:/opt/docker-autoheal/log.json:rw \
tmknight88/docker-autoheal:latest
journeyover/docker-autoheal:latest
```

Will connect to the Docker host via unix socket location /var/run/docker.sock or Windows named pipe location //./pipe/docker_engine, monitor all containers, and write persistent log data to `/opt/docker-autoheal/log.json` as the user with the specified `uid:gid`
Expand All @@ -127,7 +127,7 @@ docker run -d --read-only \
--env="AUTOHEAL_TCP_PORT=2375" \
--env="AUTOHEAL_LOG_PERSIST=true" \
--volume=/opt/docker-autoheal/log.json:/opt/docker-autoheal/log.json:rw \
tmknight88/docker-autoheal:latest
journeyover/docker-autoheal:latest
```

Will connect to the Docker host via hostname or IP and the specified port, monitor only containers with a label `autoheal.monitor.enable=true`, and write persistent log data to `/opt/docker-autoheal/log.json` as the user with the specified `uid:gid`
Expand Down Expand Up @@ -222,11 +222,11 @@ docker run ... -v /etc/localtime:/etc/localtime:ro

- [willfarrell](https://github.com/willfarrell)

[GitHubReleaseBadge]: https://img.shields.io/github/actions/workflow/status/tmknight/docker-autoheal/github-release.yml?branch=main&style=flat&logo=github&color=32c855&label=generate%20release&cacheSeconds=9000
[GitHubReleaseLink]: https://github.com/tmknight/docker-autoheal/releases
[DockerPublishingBadge]: https://img.shields.io/github/actions/workflow/status/tmknight/docker-autoheal/docker-publish.yml?branch=main&style=flat&logo=github&color=32c855&label=publish%20image&cacheSeconds=9000
[DockerPullsBadge]: https://img.shields.io/docker/pulls/tmknight88/docker-autoheal?style=flat&logo=docker&color=blue&cacheSeconds=9000
[DockerSizeBadge]: https://img.shields.io/docker/image-size/tmknight88/docker-autoheal?sort=date&arch=amd64&style=flat&logo=docker&color=blue&cacheSeconds=9000
[DockerLink]: https://hub.docker.com/r/tmknight88/docker-autoheal
<!-- [GithubAssetDlBadge]: https://img.shields.io/github/downloads/tmknight/docker-autoheal/total?style=flat&logo=github&color=32c855&label=release%20downloads&cacheSeconds=7200
[GithubAssetDlLink]: https://github.com/tmknight/docker-autoheal/releases -->
[GitHubReleaseBadge]: https://img.shields.io/github/actions/workflow/status/JourneyDocker/docker-autoheal/github-release.yml?branch=main&style=flat&logo=github&color=32c855&label=generate%20release&cacheSeconds=9000
[GitHubReleaseLink]: https://github.com/JourneyDocker/docker-autoheal/releases
[DockerPublishingBadge]: https://img.shields.io/github/actions/workflow/status/JourneyDocker/docker-autoheal/docker-publish.yml?branch=main&style=flat&logo=github&color=32c855&label=publish%20image&cacheSeconds=9000
[DockerPullsBadge]: https://img.shields.io/docker/pulls/journeyover/docker-autoheal?style=flat&logo=docker&color=blue&cacheSeconds=9000
[DockerSizeBadge]: https://img.shields.io/docker/image-size/journeyover/docker-autoheal?sort=date&arch=amd64&style=flat&logo=docker&color=blue&cacheSeconds=9000
[DockerLink]: https://hub.docker.com/r/journeyover/docker-autoheal
<!-- [GithubAssetDlBadge]: https://img.shields.io/github/downloads/JourneyDocker/docker-autoheal/total?style=flat&logo=github&color=32c855&label=release%20downloads&cacheSeconds=7200
[GithubAssetDlLink]: https://github.com/JourneyDocker/docker-autoheal/releases -->
3 changes: 2 additions & 1 deletion docker/alpine/stable/docker-autoheal.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN apk add \
gzip

RUN [ "${TARGETARCH}" == "amd64" ] && ARCH=x86_64 || ARCH=aarch64 \
&& curl -sLO https://github.com/tmknight/docker-autoheal/releases/latest/download/docker-autoheal-${ARCH}-unknown-linux-musl.tar.gz \
&& curl -sLO https://github.com/JourneyDocker/docker-autoheal/releases/latest/download/docker-autoheal-${ARCH}-unknown-linux-musl.tar.gz \
&& tar -xvf docker-autoheal-${ARCH}-unknown-linux-musl.tar.gz \
&& chmod +x docker-autoheal

Expand All @@ -21,6 +21,7 @@ COPY --from=build /docker-autoheal /docker-autoheal

RUN apk update \
&& apk upgrade --no-cache --no-progress --purge \
&& apk add --no-cache tzdata \
&& rm -rf \
/tmp/* \
/var/tmp/*
Expand Down

0 comments on commit 48f0c4b

Please sign in to comment.