From 203a5610ed653795329e1d447f6eef12aa2d507c Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sat, 13 Aug 2022 15:59:32 +0530 Subject: [PATCH 01/25] add env variables --- .github/workflows/docker-test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 8381edb..621b0ab 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -10,6 +10,10 @@ on: - master - mseed +env: + AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID}} + AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} + jobs: Docker-tests: runs-on: ubuntu-20.04 From 7fbffdfe2ec894d135cd4207e3f0d42d3573558d Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sat, 13 Aug 2022 16:13:44 +0530 Subject: [PATCH 02/25] test without env_file in docker-compose --- mseed/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mseed/docker-compose.yml b/mseed/docker-compose.yml index 7a17403..330a503 100644 --- a/mseed/docker-compose.yml +++ b/mseed/docker-compose.yml @@ -5,7 +5,7 @@ services: build: ./ command: tail -F README.md restart: always - env_file: .env + #env_file: .env volumes: - data:/tmp depends_on: @@ -16,7 +16,7 @@ services: build: ./ command: ./streamfiles.sh restart: always - env_file: .env + #env_file: .env volumes: - data:/tmp privileged: true From 77655879e6cb38b7a476e02ea4fec6190d3f9a5e Mon Sep 17 00:00:00 2001 From: karan mishra Date: Mon, 15 Aug 2022 10:49:27 +0530 Subject: [PATCH 03/25] add steps for bse image --- .github/workflows/docker-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 621b0ab..a9da514 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -19,8 +19,10 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + - name: build base image + run: cd base/amd64 && ./buildamdbase.sh - name: start containers - run: cd mseed/ && docker-compose up --build + run: cd ../mseed && docker-compose up --build - name: clean up containers run: docker-compose down From 8f477896a4d379a73310212ae1d487e84ed214c3 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Mon, 15 Aug 2022 11:00:57 +0530 Subject: [PATCH 04/25] test dir w ls --- .github/workflows/docker-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index a9da514..b70e53b 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -20,9 +20,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: build base image - run: cd base/amd64 && ./buildamdbase.sh + run: cd base/amd64 && ./buildamdbase.sh && ls - name: start containers - run: cd ../mseed && docker-compose up --build + run: cd ../../mseed && docker-compose up --build - name: clean up containers run: docker-compose down From d655b1b52fc678da702b5f80c7d39137243ef229 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Mon, 15 Aug 2022 11:14:22 +0530 Subject: [PATCH 05/25] remove ../ --- .github/workflows/docker-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index b70e53b..7083f67 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -20,9 +20,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: build base image - run: cd base/amd64 && ./buildamdbase.sh && ls + run: cd base/amd64 && ./buildamdbase.sh - name: start containers - run: cd ../../mseed && docker-compose up --build + run: ls && cd mseed && docker-compose up --build - name: clean up containers run: docker-compose down From 1b988dd159c6c51043b0dd94955536eeaaa4702d Mon Sep 17 00:00:00 2001 From: karan mishra Date: Mon, 15 Aug 2022 22:42:18 +0530 Subject: [PATCH 06/25] add repository secrets --- .github/workflows/docker-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 7083f67..bcbbeb3 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -13,6 +13,9 @@ on: env: AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID}} AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} + BUCKET_TYPE: ${{ secrets.BUCKET_TYPE}} + NODE_NAME: ${{ secrets.NODE_NAME }} + NODE_TYPE: ${{ secrets.NODE_TYPE }} jobs: Docker-tests: From 070efc6087f29537b4f336f983cbe10fe7623740 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Fri, 19 Aug 2022 00:43:13 +0530 Subject: [PATCH 07/25] docker build test --- .github/workflows/docker-build.yml | 40 ++++++++++++++++++++++++++++++ .github/workflows/docker-test.yml | 31 ----------------------- 2 files changed, 40 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/docker-build.yml delete mode 100644 .github/workflows/docker-test.yml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml new file mode 100644 index 0000000..6b464a8 --- /dev/null +++ b/.github/workflows/docker-build.yml @@ -0,0 +1,40 @@ +name: docker image testing + +on: + push: + branches: + - master + - mseed + pull_request: + branches: + - master + - mseed + + +jobs: + Docker-tests: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + context: ./ + file: ./base/amd/buildamdbase.sh + push: true + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest + + - name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} + diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml deleted file mode 100644 index bcbbeb3..0000000 --- a/.github/workflows/docker-test.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: docker image testing - -on: - push: - branches: - - master - - mseed - pull_request: - branches: - - master - - mseed - -env: - AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID}} - AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} - BUCKET_TYPE: ${{ secrets.BUCKET_TYPE}} - NODE_NAME: ${{ secrets.NODE_NAME }} - NODE_TYPE: ${{ secrets.NODE_TYPE }} - -jobs: - Docker-tests: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: build base image - run: cd base/amd64 && ./buildamdbase.sh - - name: start containers - run: ls && cd mseed && docker-compose up --build - - name: clean up containers - run: docker-compose down - From f3c36e68ce69c0181b62923ae9e3aedba57d9f68 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Fri, 19 Aug 2022 00:45:44 +0530 Subject: [PATCH 08/25] fix directory path --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 6b464a8..18d6483 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -31,7 +31,7 @@ jobs: uses: docker/build-push-action@v2 with: context: ./ - file: ./base/amd/buildamdbase.sh + file: ./base/amd64/buildamdbase.sh push: true tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest From c6b861db89b5ac0b90861b422b097692255c845d Mon Sep 17 00:00:00 2001 From: karan mishra Date: Fri, 19 Aug 2022 00:56:24 +0530 Subject: [PATCH 09/25] concat dockerfile and dockercommon --- .github/workflows/docker-build.yml | 2 +- base/amd64/Dockerfile | 34 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 18d6483..8ac6128 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -31,7 +31,7 @@ jobs: uses: docker/build-push-action@v2 with: context: ./ - file: ./base/amd64/buildamdbase.sh + file: ./base/amd64/Dockerfile push: true tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest diff --git a/base/amd64/Dockerfile b/base/amd64/Dockerfile index 217c3e3..d9d0620 100644 --- a/base/amd64/Dockerfile +++ b/base/amd64/Dockerfile @@ -12,3 +12,37 @@ MAINTAINER Orcasound RUN apt-get update && apt-get install -y --no-install-recommends ffmpeg + +RUN apt-get update && apt-get install -y --no-install-recommends \ + # General tools + htop \ + nano \ + sox \ + tmux \ + wget \ + curl \ + git + +# Upgrade OS +RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" + +# Set default command to bash as a placeholder +CMD ["/bin/bash"] + +# Make sure we're the root user +USER root + +WORKDIR /root + + +############################### Install boto and inotify libraies ################################### + +RUN apt-get update && apt-get install -y python3-pip +RUN pip3 install -U boto3 inotify + +############################## Copy common scripts ################################################## + +COPY . . + +# Clean up APT when done. +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 2c0a3ecc4e33f66d631c68e3cd2f4d8b72a2f812 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 00:15:49 +0530 Subject: [PATCH 10/25] test for running container --- .github/workflows/docker-build.yml | 2 +- .github/workflows/docker-run.yml | 34 ++++++++++++++++++++++++++++++ mseed/Dockerfile | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/docker-run.yml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 8ac6128..0196faa 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -12,7 +12,7 @@ on: jobs: - Docker-tests: + Docker-build-and-push: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/docker-run.yml b/.github/workflows/docker-run.yml new file mode 100644 index 0000000..e151efc --- /dev/null +++ b/.github/workflows/docker-run.yml @@ -0,0 +1,34 @@ +name: docker container testing + +on: + push: + branches: + - master + - mseed + pull_request: + branches: + - master + - mseed + +jobs: + Docker-fetch-container: + runs-on: ubuntu-20.04 + container: docker://karan2704/orcamseed:latest + steps: + + # aws-region: us-east-2 + - uses: actions/checkout@v3 + - name: start containers + env: + AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID }} + AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} + TIME_PREFIX: ${{ secrets.TIME_PREFIX }} + DELAY_SEGMENT: ${{ secrets.DELAY_SEGMENT }} + NODE_NAME: ${{ secrets.NODE_NAME }} + NODE_LOOPBACK: ${{ secrets.NODE_LOOPBACK}} + ENV: ${{ secrets.ENV }} + run: python3 ooipypull.py + + + - name: clean up containers + run: docker kill $(docker ps -q) \ No newline at end of file diff --git a/mseed/Dockerfile b/mseed/Dockerfile index f8e7d0b..9be5bdf 100644 --- a/mseed/Dockerfile +++ b/mseed/Dockerfile @@ -4,7 +4,7 @@ # Docker currently has a bug where armel is used instead when relying on # multiarch manifest: https://github.com/moby/moby/issues/34875 # When this is fixed, this can be changed to just `FROM debian:stretch-slim` -FROM orcastream/orcabase:latest +FROM karan2704/orcamseed:latest MAINTAINER Orcasound RUN pip3 install numpy From 03b5619bcaf241f10715de7ed0cf8cecae85a3d8 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 00:20:40 +0530 Subject: [PATCH 11/25] debug run test --- .github/workflows/docker-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-run.yml b/.github/workflows/docker-run.yml index e151efc..2b39820 100644 --- a/.github/workflows/docker-run.yml +++ b/.github/workflows/docker-run.yml @@ -27,7 +27,7 @@ jobs: NODE_NAME: ${{ secrets.NODE_NAME }} NODE_LOOPBACK: ${{ secrets.NODE_LOOPBACK}} ENV: ${{ secrets.ENV }} - run: python3 ooipypull.py + run: ls && python3 ooipypull.py - name: clean up containers From d2e7e6ed0534078382b677ad18c4abbcfbec7abe Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 10:59:02 +0530 Subject: [PATCH 12/25] testing in the same file --- .github/workflows/docker-build.yml | 36 +++++++++++++++++++++++++----- .github/workflows/docker-run.yml | 34 ---------------------------- mseed/Dockerfile | 2 +- 3 files changed, 32 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/docker-run.yml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 0196faa..6cd2da8 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,4 +1,4 @@ -name: docker image testing +name: dockerized tests on: push: @@ -26,15 +26,41 @@ jobs: id: buildx uses: docker/setup-buildx-action@v1 - - name: Build and push + - name: Build and push base id: docker_build uses: docker/build-push-action@v2 with: context: ./ file: ./base/amd64/Dockerfile push: true + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcabase:latest + + - name: Build and push mseed + id: docker_build + uses: docker/build-push-action@v2 + with: + context: ./ + file: ./mseed/Dockerfile + push: true tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} - + Docker-container: + runs-on: ubuntu-20.04 + container: docker://karan2704/orcamseed:latest + steps: + - uses: actions/checkout@v3 + - name: start containers + env: + AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID }} + AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} + TIME_PREFIX: ${{ secrets.TIME_PREFIX }} + DELAY_SEGMENT: ${{ secrets.DELAY_SEGMENT }} + NODE_NAME: ${{ secrets.NODE_NAME }} + NODE_LOOPBACK: ${{ secrets.NODE_LOOPBACK}} + ENV: ${{ secrets.ENV }} + run: ls && python3 ooipypull.py + + + - name: clean up containers + run: docker kill $(docker ps -q) + diff --git a/.github/workflows/docker-run.yml b/.github/workflows/docker-run.yml deleted file mode 100644 index 2b39820..0000000 --- a/.github/workflows/docker-run.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: docker container testing - -on: - push: - branches: - - master - - mseed - pull_request: - branches: - - master - - mseed - -jobs: - Docker-fetch-container: - runs-on: ubuntu-20.04 - container: docker://karan2704/orcamseed:latest - steps: - - # aws-region: us-east-2 - - uses: actions/checkout@v3 - - name: start containers - env: - AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID }} - AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} - TIME_PREFIX: ${{ secrets.TIME_PREFIX }} - DELAY_SEGMENT: ${{ secrets.DELAY_SEGMENT }} - NODE_NAME: ${{ secrets.NODE_NAME }} - NODE_LOOPBACK: ${{ secrets.NODE_LOOPBACK}} - ENV: ${{ secrets.ENV }} - run: ls && python3 ooipypull.py - - - - name: clean up containers - run: docker kill $(docker ps -q) \ No newline at end of file diff --git a/mseed/Dockerfile b/mseed/Dockerfile index 9be5bdf..f13f4b5 100644 --- a/mseed/Dockerfile +++ b/mseed/Dockerfile @@ -4,7 +4,7 @@ # Docker currently has a bug where armel is used instead when relying on # multiarch manifest: https://github.com/moby/moby/issues/34875 # When this is fixed, this can be changed to just `FROM debian:stretch-slim` -FROM karan2704/orcamseed:latest +FROM karan2704/orcabase:latest MAINTAINER Orcasound RUN pip3 install numpy From 16131f73c6b38b59fe7987d99399f34e7f92e87f Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 11:07:06 +0530 Subject: [PATCH 13/25] change build id --- .github/workflows/docker-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 6cd2da8..3077f1f 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -27,7 +27,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Build and push base - id: docker_build + id: docker_build_base uses: docker/build-push-action@v2 with: context: ./ @@ -36,7 +36,7 @@ jobs: tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcabase:latest - name: Build and push mseed - id: docker_build + id: docker_build_mseed uses: docker/build-push-action@v2 with: context: ./ From fb3f19efee40bd88ba2cb2fc93ef522efd88c784 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 11:13:34 +0530 Subject: [PATCH 14/25] needs parameter for container job --- .github/workflows/docker-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 3077f1f..f5b56f5 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -45,6 +45,7 @@ jobs: tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest Docker-container: + needs: Docker-build-and-push runs-on: ubuntu-20.04 container: docker://karan2704/orcamseed:latest steps: From c4f8181e5d26966c678a56cdfafa802290414ade Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 11:26:02 +0530 Subject: [PATCH 15/25] run in container --- .github/workflows/docker-build.yml | 59 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index f5b56f5..dc6fcad 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -12,44 +12,43 @@ on: jobs: - Docker-build-and-push: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Login to Docker Hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + # Docker-build-and-push: + # runs-on: ubuntu-20.04 + # steps: + # - uses: actions/checkout@v3 + # - name: Login to Docker Hub + # uses: docker/login-action@v1 + # with: + # username: ${{ secrets.DOCKER_HUB_USERNAME }} + # password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v1 + # - name: Set up Docker Buildx + # id: buildx + # uses: docker/setup-buildx-action@v1 - - name: Build and push base - id: docker_build_base - uses: docker/build-push-action@v2 - with: - context: ./ - file: ./base/amd64/Dockerfile - push: true - tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcabase:latest + # - name: Build and push base + # id: docker_build_base + # uses: docker/build-push-action@v2 + # with: + # context: ./ + # file: ./base/amd64/Dockerfile + # push: true + # tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcabase:latest - - name: Build and push mseed - id: docker_build_mseed - uses: docker/build-push-action@v2 - with: - context: ./ - file: ./mseed/Dockerfile - push: true - tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest + # - name: Build and push mseed + # id: docker_build_mseed + # uses: docker/build-push-action@v2 + # with: + # context: ./ + # file: ./mseed/Dockerfile + # push: true + # tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest Docker-container: needs: Docker-build-and-push runs-on: ubuntu-20.04 container: docker://karan2704/orcamseed:latest steps: - - uses: actions/checkout@v3 - name: start containers env: AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID }} @@ -58,7 +57,7 @@ jobs: DELAY_SEGMENT: ${{ secrets.DELAY_SEGMENT }} NODE_NAME: ${{ secrets.NODE_NAME }} NODE_LOOPBACK: ${{ secrets.NODE_LOOPBACK}} - ENV: ${{ secrets.ENV }} + ENV: ${{ secrets.ENV }} run: ls && python3 ooipypull.py From 276e1488aba9463619b01951ca7f05b5b1495bfa Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 11:27:36 +0530 Subject: [PATCH 16/25] test with only container job --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index dc6fcad..6f1775c 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -45,7 +45,7 @@ jobs: # tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest Docker-container: - needs: Docker-build-and-push + #needs: Docker-build-and-push runs-on: ubuntu-20.04 container: docker://karan2704/orcamseed:latest steps: From 517d2a053ee5741b419488f85264cc50a6a8ea09 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 11:51:35 +0530 Subject: [PATCH 17/25] test build and run together --- .github/workflows/docker-build.yml | 56 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 6f1775c..abff27a 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -12,37 +12,37 @@ on: jobs: - # Docker-build-and-push: - # runs-on: ubuntu-20.04 - # steps: - # - uses: actions/checkout@v3 - # - name: Login to Docker Hub - # uses: docker/login-action@v1 - # with: - # username: ${{ secrets.DOCKER_HUB_USERNAME }} - # password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + Docker-build-and-push: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - # - name: Set up Docker Buildx - # id: buildx - # uses: docker/setup-buildx-action@v1 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 - # - name: Build and push base - # id: docker_build_base - # uses: docker/build-push-action@v2 - # with: - # context: ./ - # file: ./base/amd64/Dockerfile - # push: true - # tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcabase:latest + - name: Build and push base + id: docker_build_base + uses: docker/build-push-action@v2 + with: + context: ./ + file: ./base/amd64/Dockerfile + push: true + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcabase:latest - # - name: Build and push mseed - # id: docker_build_mseed - # uses: docker/build-push-action@v2 - # with: - # context: ./ - # file: ./mseed/Dockerfile - # push: true - # tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest + - name: Build and push mseed + id: docker_build_mseed + uses: docker/build-push-action@v2 + with: + context: ./ + file: ./mseed/Dockerfile + push: true + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest Docker-container: #needs: Docker-build-and-push From 4651172752b0a2478ffc67b7f50360dc2d7c4a47 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 21 Aug 2022 11:52:32 +0530 Subject: [PATCH 18/25] uncomment needs --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index abff27a..288a22a 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -45,7 +45,7 @@ jobs: tags: ${{ secrets.DOCKER_HUB_USERNAME }}/orcamseed:latest Docker-container: - #needs: Docker-build-and-push + needs: Docker-build-and-push runs-on: ubuntu-20.04 container: docker://karan2704/orcamseed:latest steps: From 4eed93b86029fd2783a1da9909f89dd9c11f51d9 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Mon, 22 Aug 2022 00:11:44 +0530 Subject: [PATCH 19/25] use docker-run-action --- .github/workflows/docker-build.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 288a22a..e636705 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -47,9 +47,9 @@ jobs: Docker-container: needs: Docker-build-and-push runs-on: ubuntu-20.04 - container: docker://karan2704/orcamseed:latest steps: - name: start containers + uses: addnab/docker-run-action@v3 env: AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID }} AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} @@ -58,7 +58,12 @@ jobs: NODE_NAME: ${{ secrets.NODE_NAME }} NODE_LOOPBACK: ${{ secrets.NODE_LOOPBACK}} ENV: ${{ secrets.ENV }} - run: ls && python3 ooipypull.py + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + image: karan2704/orcamseed:latest + run: ls && python3 ooipypull.py + - name: clean up containers From a22cf729bfd9070ce4e95e9a21766cc301382a4f Mon Sep 17 00:00:00 2001 From: karan mishra Date: Mon, 22 Aug 2022 00:19:23 +0530 Subject: [PATCH 20/25] add options --- .github/workflows/docker-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index e636705..5772ae9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -62,6 +62,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} image: karan2704/orcamseed:latest + options: -v ${{ github.workspace }}:/root run: ls && python3 ooipypull.py From 06c1b98d2ff651cae5fee6187ae63daa8c1c41e2 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Wed, 24 Aug 2022 00:29:48 +0530 Subject: [PATCH 21/25] try docker run + exec --- .github/workflows/docker-build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 5772ae9..48b3af5 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: start containers - uses: addnab/docker-run-action@v3 + uses: actions/checkout@v3 env: AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID }} AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} @@ -58,14 +58,10 @@ jobs: NODE_NAME: ${{ secrets.NODE_NAME }} NODE_LOOPBACK: ${{ secrets.NODE_LOOPBACK}} ENV: ${{ secrets.ENV }} - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - image: karan2704/orcamseed:latest - options: -v ${{ github.workspace }}:/root - run: ls && python3 ooipypull.py - + run: docker run --name fetch_container karan2704/orcamseed:latest + -name: run functions + run: docker exec -w /bin/bash fetch_container ooipypull.py - name: clean up containers run: docker kill $(docker ps -q) From 5c60b27a3b3e88f86fc053812c5fb60f8d4c5a4c Mon Sep 17 00:00:00 2001 From: karan mishra Date: Wed, 24 Aug 2022 00:32:41 +0530 Subject: [PATCH 22/25] correct indentation --- .github/workflows/docker-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 48b3af5..956eee0 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -60,8 +60,8 @@ jobs: ENV: ${{ secrets.ENV }} run: docker run --name fetch_container karan2704/orcamseed:latest - -name: run functions - run: docker exec -w /bin/bash fetch_container ooipypull.py + - name: run functions + run: docker exec -w /bin/bash fetch_container ooipypull.py - name: clean up containers run: docker kill $(docker ps -q) From 0446897899f193ee48b2e2967fc09318f0cd7193 Mon Sep 17 00:00:00 2001 From: karan mishra Date: Wed, 24 Aug 2022 00:34:29 +0530 Subject: [PATCH 23/25] remove checkout-v3 --- .github/workflows/docker-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 956eee0..4257a2c 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -49,7 +49,6 @@ jobs: runs-on: ubuntu-20.04 steps: - name: start containers - uses: actions/checkout@v3 env: AWSACCESSKEYID: ${{ secrets.AWSACCESSKEYID }} AWSSECRETACCESSKEY: ${{ secrets.AWSSECRETACCESSKEY }} From 2db284aad8a7242ac43efb7f2dec60f31dbc234e Mon Sep 17 00:00:00 2001 From: karan mishra Date: Wed, 24 Aug 2022 10:47:19 +0530 Subject: [PATCH 24/25] add entrypoint to dockerfile --- mseed/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mseed/Dockerfile b/mseed/Dockerfile index f13f4b5..0e97f07 100644 --- a/mseed/Dockerfile +++ b/mseed/Dockerfile @@ -7,6 +7,8 @@ FROM karan2704/orcabase:latest MAINTAINER Orcasound +ENTRYPOINT ["tail", "-f", "/dev/null"] + RUN pip3 install numpy RUN pip3 install obspy RUN pip3 install ooipy From 13059fbf9b2782076d7de52aca1699c9f37bf93b Mon Sep 17 00:00:00 2001 From: karan mishra Date: Sun, 18 Sep 2022 19:53:24 +0530 Subject: [PATCH 25/25] merge recent changes --- mseed/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mseed/Dockerfile b/mseed/Dockerfile index 0e97f07..e9e661c 100644 --- a/mseed/Dockerfile +++ b/mseed/Dockerfile @@ -4,11 +4,9 @@ # Docker currently has a bug where armel is used instead when relying on # multiarch manifest: https://github.com/moby/moby/issues/34875 # When this is fixed, this can be changed to just `FROM debian:stretch-slim` -FROM karan2704/orcabase:latest +FROM karan2704/orcabase-amd64:latest MAINTAINER Orcasound -ENTRYPOINT ["tail", "-f", "/dev/null"] - RUN pip3 install numpy RUN pip3 install obspy RUN pip3 install ooipy