From 55043c481eec1936c35d872956d4b59aa29f436e Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Sun, 18 Jun 2023 13:34:10 -0700 Subject: [PATCH 1/2] image will now boot --- .drone.yml | 34 +++++++++++++++ .github/workflows/docker.build.yaml | 64 ----------------------------- Dockerfile | 4 +- 3 files changed, 36 insertions(+), 66 deletions(-) create mode 100644 .drone.yml delete mode 100644 .github/workflows/docker.build.yaml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..da7386f --- /dev/null +++ b/.drone.yml @@ -0,0 +1,34 @@ +--- +kind: pipeline +type: docker +name: build + +steps: + - name: build image + image: plugins/docker + settings: + repo: jtom38/cloudflare-ddns + username: jtom38 + password: + from_secret: DockerPushPat +trigger: + branch: + include: + - main + - releases/* + event: + exclude: + - pull_request + +--- +kind: pipeline +type: docker +name: compile +steps: + - name: Compile project + image: goloang:latest + commands: + - go build +trigger: + event: + - pull_request \ No newline at end of file diff --git a/.github/workflows/docker.build.yaml b/.github/workflows/docker.build.yaml deleted file mode 100644 index 7b4e750..0000000 --- a/.github/workflows/docker.build.yaml +++ /dev/null @@ -1,64 +0,0 @@ -name: Docker - -# 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. - -on: - #schedule: - # - cron: '21 19 * * *' - push: - branches: [ master ] - # Publish semver tags as releases. - tags: [ 'v*.*.*' ] - #pull_request: - # branches: [ master ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }} - - -jobs: - build: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Extract metadata (tags, labels) for Docker - # https://github.com/docker/metadata-action - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - #images: ${{ env.REGISTRY }}/newsbot.worker - - # Build and push Docker image with Buildx (don't push on PR) - # https://github.com/docker/build-push-action - - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 175cc09..bea47c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,6 @@ FROM alpine:latest as app RUN apk --no-cache add bash libc6-compat && \ mkdir /app -COPY --from=build /app/ddns /app +COPY --from=build /app/ddns /usr/bin/ddns -CMD [ "/app/ddns" ] \ No newline at end of file +CMD [ "ddns" ] \ No newline at end of file From 209f07dea0d60e8fd292800d0c5836edafd85500 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Sun, 18 Jun 2023 13:35:40 -0700 Subject: [PATCH 2/2] fixed ci image --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index da7386f..32e879d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,7 +26,7 @@ type: docker name: compile steps: - name: Compile project - image: goloang:latest + image: golang:latest commands: - go build trigger: