From 8336f99a8d2fbce369d51274155d8bc81e112236 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 20:39:38 +0700 Subject: [PATCH 01/20] Updated the branding --- action.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index f21ddc4..f982460 100644 --- a/action.yml +++ b/action.yml @@ -1,7 +1,5 @@ name: 'Starter Docker' description: 'Starter Docker GitHub Action for CUBETIQ and docker environment.' -color: 'yellow' -icon: 'box' inputs: image: description: 'Docker image name' @@ -31,4 +29,7 @@ inputs: required: false runs: using: 'docker' - image: 'Dockerfile' \ No newline at end of file + image: 'Dockerfile' +branding: + color: 'yellow' + icon: 'box' \ No newline at end of file From ba39dacc6a51d460cdad047d41333422de548884 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 20:45:04 +0700 Subject: [PATCH 02/20] Updated readme and add usage --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a3fb8f..ab29157 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,14 @@ # Starter Docker - GitHub Actions -- Run actions with docker +- Run actions with docker (latest version) - Quick and easy to use +- Support custom registry +- Support custom shell and commands + +# Usage +```yml +- name: Starter Docker + uses: CUBETIQ/starter-docker-actions@v0.1 +``` # Contributors - Sambo Chea \ No newline at end of file From 21c3ada301756dd1070757b7cb2fb1c9ca54ca52 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 20:49:41 +0700 Subject: [PATCH 03/20] Create main.yml --- .github/workflows/main.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..0dc8195 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,17 @@ +name: CI + +on: + push: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: cubetiq/starter-docker-actions@v0.1 + - name: Starter Docker Test + run: | + docker images + docker ps + docker --version From ae83b97fa5b1f588d8d87a1dc6a87b18f40704b2 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 20:54:06 +0700 Subject: [PATCH 04/20] Add and fixed the docker run in action --- README.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ab29157..24213c3 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,30 @@ - Support custom shell and commands # Usage -```yml +```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.1 + uses: CUBETIQ/starter-docker-actions@1 +``` + +# Example Action +```yaml +name: CI + +on: + push: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: cubetiq/starter-docker-actions@v0.1 + - name: Starter Docker Test + run: | + docker images + docker ps + docker --version ``` # Contributors From 6a07ee532e5dd32fcd95efff7a1f4f1f70bb5e57 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 20:55:58 +0700 Subject: [PATCH 05/20] Updated to version 0.2 --- Dockerfile | 4 +++- README.md | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3450511..ffb275f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM docker:latest RUN apk add bash -COPY entrypoint.sh /entrypoint.sh +RUN chmod +x ./entrypoint.sh + +COPY ./entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/README.md b/README.md index 24213c3..cf923e4 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ # Usage ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@1 + uses: CUBETIQ/starter-docker-actions@v0.2 ``` # Example Action @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.1 + - uses: cubetiq/starter-docker-actions@v0.2 - name: Starter Docker Test run: | docker images From 3bb2eda41b86f7b6ee8d9697b3cd9b72e5461583 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 20:58:05 +0700 Subject: [PATCH 06/20] Format readme --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf923e4..5f3ed4d 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,25 @@ # Starter Docker - GitHub Actions + - Run actions with docker (latest version) - Quick and easy to use - Support custom registry - Support custom shell and commands # Usage + ```yaml - name: Starter Docker uses: CUBETIQ/starter-docker-actions@v0.2 ``` # Example Action + ```yaml name: CI on: push: - branches: [ master ] + branches: [master] jobs: build: @@ -32,4 +35,5 @@ jobs: ``` # Contributors -- Sambo Chea \ No newline at end of file + +- Sambo Chea From dada0d68db8c5df84abac488f834a2b785d5d45d Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 20:58:29 +0700 Subject: [PATCH 07/20] Updated file action --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0dc8195..2e214df 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.1 + - uses: cubetiq/starter-docker-actions@v0.2 - name: Starter Docker Test run: | docker images From 002b10a97bcc6c2e573a03d7a7a2270190e3f8f3 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 20:59:45 +0700 Subject: [PATCH 08/20] Fixed chmod for entrypoint --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffb275f..cb90a71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ FROM docker:latest RUN apk add bash -RUN chmod +x ./entrypoint.sh - COPY ./entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file From 9758e247025ee23da456c3b737fc38aaeb69af54 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:00:19 +0700 Subject: [PATCH 09/20] Updated action version 0.3 --- .github/workflows/main.yml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e214df..67fedca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.2 + - uses: cubetiq/starter-docker-actions@v0.3 - name: Starter Docker Test run: | docker images diff --git a/README.md b/README.md index 5f3ed4d..f5d73be 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.2 + uses: CUBETIQ/starter-docker-actions@v0.3 ``` # Example Action @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.2 + - uses: cubetiq/starter-docker-actions@v0.3 - name: Starter Docker Test run: | docker images From b34a9fb6c7b72058a543af400ada832dd34093b8 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:13:21 +0700 Subject: [PATCH 10/20] Updated to version 0.4 --- .github/workflows/main.yml | 11 +++++------ README.md | 4 ++-- entrypoint.sh | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 67fedca..f29db92 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,16 +2,15 @@ name: CI on: push: - branches: [ master ] + branches: [master] jobs: build: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.3 + - uses: cubetiq/starter-docker-actions@v0.4 - name: Starter Docker Test - run: | - docker images - docker ps - docker --version + with: + shell: bash + run: docker version diff --git a/README.md b/README.md index f5d73be..8765e62 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.3 + uses: CUBETIQ/starter-docker-actions@v0.4 ``` # Example Action @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.3 + - uses: cubetiq/starter-docker-actions@v0.4 - name: Starter Docker Test run: | docker images diff --git a/entrypoint.sh b/entrypoint.sh index d83330a..d5ccf7c 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -6,6 +6,8 @@ fi echo "$INPUT_RUN" | sed -e 's/\\n/;/g' > semicolon_delimited_script +echo "INPUT RUN => $semicolon_delimited_script" + if [ ! -z $INPUT_DOCKER_NETWORK ]; then INPUT_OPTIONS="$INPUT_OPTIONS --network $INPUT_DOCKER_NETWORK" fi From 1769fc1d528693540e4b10174e0efd9455b922f5 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:16:09 +0700 Subject: [PATCH 11/20] Updated action on master --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f29db92..f136e04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [master] + branches: [ master ] jobs: build: From 185a8b5025ce83a429f04809f69f32f1503612f2 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:19:42 +0700 Subject: [PATCH 12/20] Updated action --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f136e04..a3e907c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,8 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.4 - name: Starter Docker Test + uses: cubetiq/starter-docker-actions@v0.4 with: shell: bash run: docker version From 708f352a8f197e0b22664a6f26df828c72d99d27 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:26:00 +0700 Subject: [PATCH 13/20] Updated entrypoint --- .github/workflows/main.yml | 2 +- README.md | 4 ++-- entrypoint.sh | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3e907c..53e02cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.4 + uses: cubetiq/starter-docker-actions@v0.5 with: shell: bash run: docker version diff --git a/README.md b/README.md index 8765e62..a8bc5ea 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.4 + uses: CUBETIQ/starter-docker-actions@v0.5 ``` # Example Action @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.4 + - uses: cubetiq/starter-docker-actions@v0.5 - name: Starter Docker Test run: | docker images diff --git a/entrypoint.sh b/entrypoint.sh index d5ccf7c..b370284 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -6,10 +6,16 @@ fi echo "$INPUT_RUN" | sed -e 's/\\n/;/g' > semicolon_delimited_script -echo "INPUT RUN => $semicolon_delimited_script" - if [ ! -z $INPUT_DOCKER_NETWORK ]; then INPUT_OPTIONS="$INPUT_OPTIONS --network $INPUT_DOCKER_NETWORK" fi -exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "`cat semicolon_delimited_script`" \ No newline at end of file +if [ -z $INPUT_SHELL ]; +then INPUT_IMAGE=bash +fi + +if [ -z $semicolon_delimited_script ]; +then semicolon_delimited_script="echo $(whoami)" +fi + +exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS $INPUT_IMAGE $INPUT_SHELL -c "`cat semicolon_delimited_script`" \ No newline at end of file From 6129ff1f26af70fa7bcfde332c29091efb15615c Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:30:08 +0700 Subject: [PATCH 14/20] Updated to 0.6 --- .github/workflows/main.yml | 2 +- README.md | 4 ++-- entrypoint.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53e02cc..4c4839b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.5 + uses: cubetiq/starter-docker-actions@v0.6 with: shell: bash run: docker version diff --git a/README.md b/README.md index a8bc5ea..7321794 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.5 + uses: CUBETIQ/starter-docker-actions@v0.6 ``` # Example Action @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.5 + - uses: cubetiq/starter-docker-actions@v0.6 - name: Starter Docker Test run: | docker images diff --git a/entrypoint.sh b/entrypoint.sh index b370284..46c7e8d 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -18,4 +18,4 @@ if [ -z $semicolon_delimited_script ]; then semicolon_delimited_script="echo $(whoami)" fi -exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS $INPUT_IMAGE $INPUT_SHELL -c "`cat semicolon_delimited_script`" \ No newline at end of file +exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS $INPUT_SHELL -c "`cat semicolon_delimited_script`" $INPUT_IMAGE \ No newline at end of file From db8877c80f0d66bc74e0a5f98111f870cc4a8ea4 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:33:19 +0700 Subject: [PATCH 15/20] Add 0.7 --- .github/workflows/main.yml | 2 +- README.md | 13 ++++++------- entrypoint.sh | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c4839b..cafd33a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.6 + uses: cubetiq/starter-docker-actions@v0.7 with: shell: bash run: docker version diff --git a/README.md b/README.md index 7321794..253549f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.6 + uses: CUBETIQ/starter-docker-actions@v0.7 ``` # Example Action @@ -19,19 +19,18 @@ name: CI on: push: - branches: [master] + branches: [ master ] jobs: build: runs-on: ubuntu-latest steps: - - uses: cubetiq/starter-docker-actions@v0.6 - name: Starter Docker Test - run: | - docker images - docker ps - docker --version + uses: cubetiq/starter-docker-actions@v0.7 + with: + shell: bash + run: docker version ``` # Contributors diff --git a/entrypoint.sh b/entrypoint.sh index 46c7e8d..ae443cc 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -18,4 +18,4 @@ if [ -z $semicolon_delimited_script ]; then semicolon_delimited_script="echo $(whoami)" fi -exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS $INPUT_SHELL -c "`cat semicolon_delimited_script`" $INPUT_IMAGE \ No newline at end of file +exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE "`cat semicolon_delimited_script`" \ No newline at end of file From 37eff36a01f5a428420a986c5750590c8175e7cf Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:34:58 +0700 Subject: [PATCH 16/20] Fixed and remove commands form parm --- .github/workflows/main.yml | 2 +- README.md | 4 ++-- entrypoint.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cafd33a..5c03f61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.7 + uses: cubetiq/starter-docker-actions@v0.8 with: shell: bash run: docker version diff --git a/README.md b/README.md index 253549f..7b3c4de 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.7 + uses: CUBETIQ/starter-docker-actions@v0.8 ``` # Example Action @@ -27,7 +27,7 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.7 + uses: cubetiq/starter-docker-actions@v0.8 with: shell: bash run: docker version diff --git a/entrypoint.sh b/entrypoint.sh index ae443cc..fe3efaf 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -18,4 +18,4 @@ if [ -z $semicolon_delimited_script ]; then semicolon_delimited_script="echo $(whoami)" fi -exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE "`cat semicolon_delimited_script`" \ No newline at end of file +exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE \ No newline at end of file From 4b3e16a4676a188c37ae220f8a8dc6a95ae848ec Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:42:12 +0700 Subject: [PATCH 17/20] Fixed docker image and commands and add 0.9 --- .github/workflows/main.yml | 2 +- README.md | 4 ++-- entrypoint.sh | 11 +++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c03f61..2a0bb85 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.8 + uses: cubetiq/starter-docker-actions@v0.9 with: shell: bash run: docker version diff --git a/README.md b/README.md index 7b3c4de..d0e32a9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.8 + uses: CUBETIQ/starter-docker-actions@v0.9 ``` # Example Action @@ -27,7 +27,7 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.8 + uses: cubetiq/starter-docker-actions@v0.9 with: shell: bash run: docker version diff --git a/entrypoint.sh b/entrypoint.sh index fe3efaf..ec21839 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -11,11 +11,18 @@ then INPUT_OPTIONS="$INPUT_OPTIONS --network $INPUT_DOCKER_NETWORK" fi if [ -z $INPUT_SHELL ]; -then INPUT_IMAGE=bash +then INPUT_SHELL=bash fi +if [ -z $INPUT_IMAGE ]; +then INPUT_IMAGE=docker +fi + +echo "Shell: $INPUT_SHELL" +echo "Image: $INPUT_IMAGE" + if [ -z $semicolon_delimited_script ]; then semicolon_delimited_script="echo $(whoami)" fi -exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE \ No newline at end of file +exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "`cat semicolon_delimited_script`" \ No newline at end of file From 796132e773123c702fb700f583c74cc5c023e2db Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:45:10 +0700 Subject: [PATCH 18/20] Updated the entrypoint --- .github/workflows/main.yml | 2 +- entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a0bb85..2b4a0d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,5 +12,5 @@ jobs: - name: Starter Docker Test uses: cubetiq/starter-docker-actions@v0.9 with: - shell: bash + shell: sh run: docker version diff --git a/entrypoint.sh b/entrypoint.sh index ec21839..9bbbe4a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -11,7 +11,7 @@ then INPUT_OPTIONS="$INPUT_OPTIONS --network $INPUT_DOCKER_NETWORK" fi if [ -z $INPUT_SHELL ]; -then INPUT_SHELL=bash +then INPUT_SHELL=sh fi if [ -z $INPUT_IMAGE ]; From 24aa129e67087e327ea77b0ca00d4ac827e024e4 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:49:36 +0700 Subject: [PATCH 19/20] Fixed the docker and shell and remove bash --- .github/workflows/main.yml | 3 +-- README.md | 4 ++-- entrypoint.sh | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b4a0d6..ee26ae9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,6 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.9 + uses: cubetiq/starter-docker-actions@v1 with: - shell: sh run: docker version diff --git a/README.md b/README.md index d0e32a9..740971e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ```yaml - name: Starter Docker - uses: CUBETIQ/starter-docker-actions@v0.9 + uses: CUBETIQ/starter-docker-actions@v1 ``` # Example Action @@ -27,7 +27,7 @@ jobs: steps: - name: Starter Docker Test - uses: cubetiq/starter-docker-actions@v0.9 + uses: cubetiq/starter-docker-actions@v1 with: shell: bash run: docker version diff --git a/entrypoint.sh b/entrypoint.sh index 9bbbe4a..970a464 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -18,9 +18,6 @@ if [ -z $INPUT_IMAGE ]; then INPUT_IMAGE=docker fi -echo "Shell: $INPUT_SHELL" -echo "Image: $INPUT_IMAGE" - if [ -z $semicolon_delimited_script ]; then semicolon_delimited_script="echo $(whoami)" fi From ca2ba46b00a61f9cdb1aa64eaddd5276d252a0f0 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Fri, 26 Mar 2021 21:51:43 +0700 Subject: [PATCH 20/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 740971e..fd4fab2 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ jobs: - name: Starter Docker Test uses: cubetiq/starter-docker-actions@v1 with: - shell: bash + shell: sh run: docker version ```