update tools.

dojyorin · Jul 4, 2024 · c8df158 · c8df158
1 parent 443fd14
commit c8df158
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/_push.json b/.github/workflows/_push.json
@@ -41,7 +41,7 @@
                 }
             }, {
                 "name": "build and push image",
-                "uses": "docker/build-push-action@v5",
+                "uses": "docker/build-push-action@v6",
                 "with": {
                     "push": true,
                     "pull": true,

diff --git a/.github/workflows/_push.yaml b/.github/workflows/_push.yaml
@@ -28,7 +28,7 @@ jobs:
                 username: ${{github.repository_owner}}
                 password: ${{secrets.DOCKERHUB_KEY}}
             - name: build and push image
-              uses: docker/build-push-action@v5
+              uses: docker/build-push-action@v6
               with:
                 push: true
                 pull: true

diff --git a/.github/workflows/_test.json b/.github/workflows/_test.json
@@ -38,7 +38,7 @@
                 "uses": "docker/setup-buildx-action@v3"
             }, {
                 "name": "build and load image",
-                "uses": "docker/build-push-action@v5",
+                "uses": "docker/build-push-action@v6",
                 "with": {
                     "load": true,
                     "pull": true,
@@ -51,7 +51,7 @@
                 }
             }, {
                 "name": "test image",
-                "run": "docker run --rm --init --platform linux/${{matrix.arch}} ${{github.sha}} eval -p 'new Date()'"
+                "run": "docker run --init --rm --platform linux/${{matrix.arch}} ${{github.sha}} eval -p 'new Date()'"
             }]
         }
     }

diff --git a/.github/workflows/_test.yaml b/.github/workflows/_test.yaml
@@ -26,7 +26,7 @@ jobs:
             - name: setup docker-buildx
               uses: docker/setup-buildx-action@v3
             - name: build and load image
-              uses: docker/build-push-action@v5
+              uses: docker/build-push-action@v6
               with:
                 load: true
                 pull: true
@@ -37,4 +37,4 @@ jobs:
                 file: ${{matrix.os}}.dockerfile
                 build-args: DENO_VERSION=${{inputs.deno_version}}
             - name: test image
-              run: docker run --rm --init --platform linux/${{matrix.arch}} ${{github.sha}} eval -p 'new Date()'
+              run: docker run --init --rm --platform linux/${{matrix.arch}} ${{github.sha}} eval -p 'new Date()'
diff --git a/README.md b/README.md
@@ -29,11 +29,11 @@ Easy to introduce in your project.
 
 **As single image**
 ```sh
-# Run REPL.
-docker run --rm --init -it dojyorin/deno:latest
+# Run repl
+docker run --init --rm -it dojyorin/deno:latest
 
-# Run script.
-docker run --rm --init --restart always -p 0.0.0.0:5000:8000 -v $(pwd)/src:/data:ro dojyorin/deno:latest run /data/main.ts
+# Run script
+docker run --init --rm --restart always -p 0.0.0.0:8000:8000 -v $(pwd)/src:/data:ro dojyorin/deno:latest run /data/main.ts
 ```
 
 **As compose**
@@ -44,7 +44,7 @@ services:
     init: true
     restart: always
     ports:
-        - 0.0.0.0:5000:8000
+        - 0.0.0.0:8000:8000
     volumes:
         - ./src:/data:ro
     command:

diff --git a/src/alpine.dockerfile b/src/alpine.dockerfile
@@ -3,13 +3,13 @@ FROM alpine:latest AS deno
 ARG DENO_VERSION
 
 RUN apk --update --no-cache add curl
-RUN curl -Ls https://github.com/denoland/deno/releases/download/${DENO_VERSION}/deno-$(arch)-unknown-linux-gnu.zip | unzip -q -d /tmp - 'deno'
+RUN curl -Ls https://github.com/denoland/deno/releases/download/${DENO_VERSION}/deno-$(arch)-unknown-linux-gnu.zip | unzip -pq - 'deno' > /tmp/deno
 
 FROM gcr.io/distroless/cc-debian12:latest AS cc
 
 FROM alpine:latest AS sym
 
-COPY --from=cc --chown=root:root --chmod=755 /lib/*-linux-gnu/ld-linux-* /usr/local/lib/
+COPY --from=cc --chmod=755 --chown=root:root /lib/*-linux-gnu/ld-linux-* /usr/local/lib/
 
 RUN mkdir -p /tmp/lib
 RUN ln -s /usr/local/lib/ld-linux-* /tmp/lib/
@@ -18,10 +18,10 @@ FROM alpine:latest
 
 ENV LD_LIBRARY_PATH="/usr/local/lib"
 
-COPY --from=deno --chown=root:root --chmod=755 /tmp/deno /usr/local/bin/
-COPY --from=cc --chown=root:root --chmod=755 /lib/*-linux-gnu/* /usr/local/lib/
-COPY --from=sym --chown=root:root --chmod=755 /tmp/lib /lib
-COPY --from=sym --chown=root:root --chmod=755 /tmp/lib /lib64
+COPY --from=deno --chmod=755 --chown=root:root /tmp/deno /usr/local/bin/
+COPY --from=cc --chmod=755 --chown=root:root /lib/*-linux-gnu/* /usr/local/lib/
+COPY --from=sym --chmod=755 --chown=root:root /tmp/lib /lib
+COPY --from=sym --chmod=755 --chown=root:root /tmp/lib /lib64
 
 RUN sed -i -e 's|nobody:/|nobody:/home|' /etc/passwd && chown nobody:nobody /home
 

diff --git a/src/distroless.dockerfile b/src/distroless.dockerfile
@@ -3,13 +3,13 @@ FROM alpine:latest AS deno
 ARG DENO_VERSION
 
 RUN apk --update --no-cache add curl
-RUN curl -Ls https://github.com/denoland/deno/releases/download/${DENO_VERSION}/deno-$(arch)-unknown-linux-gnu.zip | unzip -q -d /tmp - 'deno'
+RUN curl -Ls https://github.com/denoland/deno/releases/download/${DENO_VERSION}/deno-$(arch)-unknown-linux-gnu.zip | unzip -pq - 'deno' > /tmp/deno
 
 FROM gcr.io/distroless/cc-debian12:latest AS cc
 
 FROM alpine:latest AS sym
 
-COPY --from=cc --chown=root:root --chmod=755 /lib/*-linux-gnu/ld-linux-* /usr/local/lib/
+COPY --from=cc --chmod=755 --chown=root:root /lib/*-linux-gnu/ld-linux-* /usr/local/lib/
 
 RUN mkdir -p /tmp/lib
 RUN ln -s /usr/local/lib/ld-linux-* /tmp/lib/
@@ -18,10 +18,10 @@ FROM gcr.io/distroless/static-debian12:latest
 
 ENV LD_LIBRARY_PATH="/usr/local/lib"
 
-COPY --from=deno --chown=root:root --chmod=755 /tmp/deno /usr/local/bin/
-COPY --from=cc --chown=root:root --chmod=755 /lib/*-linux-gnu/* /usr/local/lib/
-COPY --from=sym --chown=root:root --chmod=755 /tmp/lib /lib
-COPY --from=sym --chown=root:root --chmod=755 /tmp/lib /lib64
+COPY --from=deno --chmod=755 --chown=root:root /tmp/deno /usr/local/bin/
+COPY --from=cc --chmod=755 --chown=root:root /lib/*-linux-gnu/* /usr/local/lib/
+COPY --from=sym --chmod=755 --chown=root:root /tmp/lib /lib
+COPY --from=sym --chmod=755 --chown=root:root /tmp/lib /lib64
 
 USER nonroot
 ENTRYPOINT ["/usr/local/bin/deno"]