From 9e280b42cb82de3e1942cff60fb2f847a7cdb7bf Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 7 May 2021 18:12:15 +0200 Subject: [PATCH 1/8] subdir --- .github/workflows/workflow.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/workflow.yml diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml new file mode 100644 index 0000000..7e0d6a7 --- /dev/null +++ b/.github/workflows/workflow.yml @@ -0,0 +1,18 @@ +name: Publish Docker image +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@v2 + - name: Push to Docker Hub + uses: docker/build-push-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_TOKEN }} + repository: bdevloed/eye + tag_with_ref: true From a98a7b0279d2d8017475d1686e8de8d61c1f432f Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 7 May 2021 18:15:30 +0200 Subject: [PATCH 2/8] Update workflow.yml on push --- .github/workflows/workflow.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 7e0d6a7..c05b82b 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,7 +1,5 @@ name: Publish Docker image -on: - release: - types: [published] +on: push jobs: push_to_registry: name: Push Docker image to Docker Hub From bfc86281b283c51f1a99e955c2f9e6c2e7c3ea52 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 7 May 2021 18:21:46 +0200 Subject: [PATCH 3/8] Update workflow.yml build push v2 --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index c05b82b..2df0d19 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -8,7 +8,7 @@ jobs: - name: Check out the repo uses: actions/checkout@v2 - name: Push to Docker Hub - uses: docker/build-push-action@v1 + uses: docker/build-push-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} From 111682d3051c672d4fa64d11e7805c82bc111e9e Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 7 May 2021 18:32:29 +0200 Subject: [PATCH 4/8] Update workflow.yml qemu buildx --- .github/workflows/workflow.yml | 39 ++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 2df0d19..4837747 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,16 +1,33 @@ -name: Publish Docker image -on: push +name: ci + +on: + push: + branches: + - 'master' + jobs: - push_to_registry: - name: Push Docker image to Docker Hub + docker: runs-on: ubuntu-latest steps: - - name: Check out the repo - uses: actions/checkout@v2 - - name: Push to Docker Hub + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build uses: docker/build-push-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - repository: bdevloed/eye - tag_with_ref: true + push: true + tags: bdevloed/eye:latest + - + name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} From 6a79d99f984f19e917b9e6764ca37c251a62b93e Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 7 May 2021 18:35:36 +0200 Subject: [PATCH 5/8] Update workflow.yml on all pushes --- .github/workflows/workflow.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 4837747..ba567a2 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,10 +1,8 @@ name: ci on: - push: - branches: - - 'master' - + push + jobs: docker: runs-on: ubuntu-latest From 2dcc4800924364c4202ed38e2979020ba648ed13 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 7 May 2021 18:37:39 +0200 Subject: [PATCH 6/8] Update workflow.yml fixed username and token variable names --- .github/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ba567a2..b0468dc 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -17,8 +17,8 @@ jobs: name: Login to DockerHub uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_TOKEN }} - name: Build and push id: docker_build From 035aca9f16530f3f1ec77d810c63c5214ac3356c Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 7 May 2021 18:43:26 +0200 Subject: [PATCH 7/8] delete old file --- .github/workflow.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflow.yml diff --git a/.github/workflow.yml b/.github/workflow.yml deleted file mode 100644 index 7e0d6a7..0000000 --- a/.github/workflow.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Publish Docker image -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@v2 - - name: Push to Docker Hub - uses: docker/build-push-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - repository: bdevloed/eye - tag_with_ref: true From cae64a5c7584f0791ca5ff9d054abc668af7b868 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Thu, 9 Jun 2022 18:57:45 +0200 Subject: [PATCH 8/8] update zip url --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ea4c7f..39eef43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,8 +45,8 @@ RUN chmod +x /usr/local/bin/cturtle && \ mkdir eye && \ cd eye && \ curl -fsS -L -O "https://raw.githubusercontent.com/josd/eye/master/eye.zip" && \ - unzip eye && ./eye/install.sh && \ - cd / && \ - rm -rf eye - + unzip eye && \ + curl -o ./eye/eye.sh.in https://raw.githubusercontent.com/josd/eye/master/eye.sh.in && \ + ./eye/install.sh + ENTRYPOINT ["/ep"]