From 768bbce8b3a76499c14f819785376a202733b4ae Mon Sep 17 00:00:00 2001 From: Niccolo Borgioli Date: Mon, 21 Oct 2024 16:03:38 +0200 Subject: [PATCH] add content --- .../github-actions/publish-docker-images.md | 12 ++++++------ pages/dev_ops/hosting/docker-registry.md | 14 ++++++++++++++ pages/git/reset-files.md | 4 ++++ 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 pages/dev_ops/hosting/docker-registry.md diff --git a/pages/dev_ops/github-actions/publish-docker-images.md b/pages/dev_ops/github-actions/publish-docker-images.md index 00e3d69..fb683e2 100644 --- a/pages/dev_ops/github-actions/publish-docker-images.md +++ b/pages/dev_ops/github-actions/publish-docker-images.md @@ -22,15 +22,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: install: true - name: Docker Labels id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | foo/bar @@ -43,19 +43,19 @@ jobs: type=semver,pattern={{major}} - name: Log in to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: platforms: linux/amd64,linux/arm64 push: true diff --git a/pages/dev_ops/hosting/docker-registry.md b/pages/dev_ops/hosting/docker-registry.md new file mode 100644 index 0000000..9b1e29d --- /dev/null +++ b/pages/dev_ops/hosting/docker-registry.md @@ -0,0 +1,14 @@ +--- +tags: + - docker registry + - hosting + - authentication +--- + +# Setup you own authenticated Docker Registry + +## Resources + +- https://earthly.dev/blog/private-docker-registry/ +- https://www.digitalocean.com/community/tutorials/how-to-set-up-a-private-docker-registry-on-ubuntu-20-04 +- https://github.com/docker/get-involved/blob/90c9470fd66c9318fec9c6f0914cb70fa87b9bf9/content/en/docs/CommunityLeaders/EventHandbooks/Docker101/registry/_index.md?plain=1#L203 diff --git a/pages/git/reset-files.md b/pages/git/reset-files.md index 79e59aa..c8070ff 100644 --- a/pages/git/reset-files.md +++ b/pages/git/reset-files.md @@ -3,5 +3,9 @@ How to reset files from another branch. ```sh +# New way +git restore my/file.md + +# Old way git checkout origin/HEAD -- my/file.md ```