Dockerfile: use bash

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 7e3ee86ee47a2d3b447b67c79c6d6a6500f96885..d4520eff7ab57dc2673207b5612d0d66a26caebc 100644 (file)
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -17,11 +17,11 @@ jobs:
       matrix:
         lws-version: [3.2.0, 3.1.0, 2.4.2]
     steps:
-      - name: install apt packages
+      - name: Install packages
         run: |
           sudo apt-get update
           sudo apt-get install build-essential cmake libjson-c-dev libssl-dev libuv1-dev
-      - name: compile libwebsockets-${{ matrix.lws-version }} from source
+      - name: Install libwebsockets-${{ matrix.lws-version }}
         env:
           LWS_VERSION: ${{ matrix.lws-version }}
         run: |
@@ -31,7 +31,7 @@ jobs:
           cmake -DLWS_WITH_LIBUV=ON -DLWS_UNIX_SOCK=ON -DLWS_IPV6=ON -DLWS_WITHOUT_TESTAPPS=ON -DCMAKE_BUILD_TYPE=RELEASE .
           make && sudo make install && sudo ldconfig
       - uses: actions/checkout@v1
-      - name: build ttyd
+      - name: Build ttyd
         run: |
           cmake -DCMAKE_BUILD_TYPE=RELEASE .
           make && sudo make install
@@ -43,7 +43,7 @@ jobs:
         arch: [i386, x86_64, arm, armhf, mips, mipsel]
     steps:
       - uses: actions/checkout@v1
-      - name: cross build (${{ matrix.arch }})
+      - name: Cross build (${{ matrix.arch }})
         env:
           ARCH: ${{ matrix.arch }}
         run: docker run --rm -v $(pwd):/ttyd -w /ttyd tsl0922/musl-cross ./scripts/cross-build.sh $ARCH

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 5c419c09b40ec5ab74b0dbb1e4b3499fb8a330bf..d0f7e07eb140ae2d7f011d0f41cad12355f677ef 100644 (file)
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: '12.x'
-      - name: yarn install, check and build
+      - name: Run yarn install, check and build
         run: |
           cd html
           yarn install

diff --git a/Dockerfile b/Dockerfile
index 493cfaf4c64329f90b40bf95ce1cb103fde60b11..5f3b2c2a05aa4c1febedea07d67575be7995817d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,14 @@
 FROM tsl0922/musl-cross
-RUN git clone --depth=1 https://github.com/tsl0922/ttyd.git /tmp/ttyd \
-    && cd /tmp/ttyd && ./scripts/cross-build.sh x86_64
+RUN git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
+    && cd /ttyd && ./scripts/cross-build.sh x86_64
 
 FROM ubuntu:18.04
-COPY --from=0 /tmp/ttyd/build/ttyd /usr/local/bin/ttyd
+COPY --from=0 /ttyd/build/ttyd /usr/bin/ttyd
 
-ENV TINI_VERSION v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
+ADD https://github.com/krallin/tini/releases/download/v0.18.0/tini /sbin/tini
+RUN chmod +x /sbin/tini
 
 EXPOSE 7681
 
-ENTRYPOINT ["/tini", "--"]
-CMD ["ttyd", "sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["ttyd", "bash"]

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index 168b0cdad1d0b17be1a1cca5512ab9cf8ce6ca6a..7f20f0d17918959aa68f263f6c6a815c098360af 100644 (file)
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -1,12 +1,12 @@
 FROM tsl0922/musl-cross
-RUN git clone --depth=1 https://github.com/tsl0922/ttyd.git /tmp/ttyd \
-    && cd /tmp/ttyd && ./scripts/cross-build.sh x86_64
+RUN git clone --depth=1 https://github.com/tsl0922/ttyd.git /ttyd \
+    && cd /ttyd && ./scripts/cross-build.sh x86_64
 
-FROM alpine:3.9
-COPY --from=0 /tmp/ttyd/build/ttyd /usr/local/bin/ttyd
-RUN apk add --no-cache tini
+FROM alpine:3.10
+COPY --from=0 /ttyd/build/ttyd /usr/bin/ttyd
+RUN apk add --no-cache bash tini
 
 EXPOSE 7681
 
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["ttyd", "sh"]
+CMD ["ttyd", "bash"]