From 869b2ad57e7347d6dffd9b60285e5eed77d24360 Mon Sep 17 00:00:00 2001
From: Tingluo Huang <tingluohuang@github.com>
Date: Fri, 22 Oct 2021 15:28:37 +0000
Subject: [PATCH] fix Dockerfiles

---
 .github/workflows/docker-image.yml | 26 --------------------------
 Dockerfile                         |  6 +++---
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index cf0baa1..d2040fc 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,7 +1,6 @@
 name: Build Alpine Node.js
 permissions:
   contents: read
-  packages: write
 
 on:
   workflow_dispatch:
@@ -22,14 +21,6 @@ jobs:
     - name: Build the Docker image
       run: |
          docker build --file Dockerfile --tag alpine_nodejs:${{github.event.inputs.NodeVersion}} --build-arg NodeVersion=${{github.event.inputs.NodeVersion}} --build-arg PythonVersion=${{github.event.inputs.PythonVersion}} .
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Debugging with tmate
-      uses: mxschmitt/action-tmate@v3
     - name: Copy alpine node.js out
       run: |
          mkdir $RUNNER_TEMP/alpine_node
@@ -55,20 +46,3 @@ jobs:
         tar xzf ./node-${{github.event.inputs.NodeVersion}}-alpine-x64.tar.gz
         ./bin/node -v
         ./bin/node -e "console.log('hello world')"
-        
-        
-        
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
diff --git a/Dockerfile b/Dockerfile
index ae72eeb..df6f9ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,11 +14,11 @@ RUN wget https://nodejs.org/dist/$NodeVersion/node-$NodeVersion.tar.gz && tar -z
 RUN cd node-$NodeVersion && ./configure --dest-cpu=x64 --partly-static && make -j$(getconf _NPROCESSORS_ONLN)
 
 # create and copy tar.gz into /node_staging
-RUN mkdir -p /usr/src/out
+RUN mkdir -p /usr/src/out/bin
 WORKDIR /usr/src/out
-RUN cp /usr/src/app/node-$NodeVersion/out/Release/node /usr/src/out/bin
+RUN cp /usr/src/app/node-$NodeVersion/out/Release/node /usr/src/out/bin/node
 RUN cp /usr/src/app/node-$NodeVersion/LICENSE /usr/src/out/LICENSE
-RUN tar -czvf node-$NodeVersion-alpine-x64.tar.gz ./bin ./LICENSE
+RUN tar -czvf node-$NodeVersion-alpine-x64.tar.gz ./bin ./LICENSE && rm -rf ./bin ./LICENSE
 RUN cp ./node-$NodeVersion-alpine-x64.tar.gz /node_staging
 
 # copy the tar.gz into the mapped in volume