idan/sshwifty-udp-telnet-http
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove code which are no longer needed from CI/Deploy files

Browse Source
This commit is contained in:
NI
2020-08-16 00:20:30 +08:00
parent 724979a17a
commit 2a9aab8d63
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ci.sh
View File

@@ -101,7 +101,7 @@ if [ "$SSHWIFTY_DEPLOY" = 'yes' ]; then
' '
docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" && docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" &&
docker buildx create --use --driver docker-container --name buildx-instance && docker buildx create --use --driver docker-container --name buildx-instance &&
docker buildx build --tag "$SSHWIFTY_DOCKER_IMAGE_PUSH_TAG" --tag "$SSHWIFTY_DOCKER_IMAGE_PUSH_TAG_LATEST" --platform "$DOCKER_BUILD_TARGETS" --build-arg "$DOCKER_NPM_REGISTRY" --progress plain --push . docker buildx build --tag "$SSHWIFTY_DOCKER_IMAGE_PUSH_TAG" --tag "$SSHWIFTY_DOCKER_IMAGE_PUSH_TAG_LATEST" --platform "$DOCKER_BUILD_TARGETS" --build-arg CUSTOM_COMMAND="$DOCKER_CUSTOM_COMMAND" --progress plain --push .
' \ ' \
' '
mkdir -p ./.tmp/generated ./.tmp/release && mkdir -p ./.tmp/generated ./.tmp/release &&

4
.github/workflows/workflow.yml vendored
View File

@@ -24,9 +24,7 @@ jobs:
export COVERALLS_TOKEN="${{ secrets.COVERALLS_TOKEN }}" export COVERALLS_TOKEN="${{ secrets.COVERALLS_TOKEN }}"
export DOCKER_HUB_USER="${{ github.repository_owner }}" export DOCKER_HUB_USER="${{ github.repository_owner }}"
# The `DOCKER_NPM_REGISTRY` is here due to problematic build process export DOCKER_CUSTOM_COMMAND='echo "GitHub Action Build"'
# for ARM64 Docker Image caused by Docker/QEMU
export DOCKER_NPM_REGISTRY="http://registry.npmjs.org/"
sudo apt-get update -qq -y sudo apt-get update -qq -y
sudo apt-get upgrade -qq -y sudo apt-get upgrade -qq -y

2
Dockerfile
View File

@@ -13,8 +13,8 @@ RUN set -ex && \
/try.sh update-ca-certificates -f && c_rehash && \ /try.sh update-ca-certificates -f && c_rehash && \
([ -z "$HTTP_PROXY" ] || (git config --global http.proxy "$HTTP_PROXY" && npm config set proxy "$HTTP_PROXY")) && \ ([ -z "$HTTP_PROXY" ] || (git config --global http.proxy "$HTTP_PROXY" && npm config set proxy "$HTTP_PROXY")) && \
([ -z "$HTTPS_PROXY" ] || (git config --global https.proxy "$HTTPS_PROXY" && npm config set https-proxy "$HTTPS_PROXY")) && \ ([ -z "$HTTPS_PROXY" ] || (git config --global https.proxy "$HTTPS_PROXY" && npm config set https-proxy "$HTTPS_PROXY")) && \
([ -z "$NPM_REGISTRY" ] || (npm config set registry="$NPM_REGISTRY")) && \
export PATH=$PATH:"$(go env GOPATH)/bin" && \ export PATH=$PATH:"$(go env GOPATH)/bin" && \
([ -z "$CUSTOM_COMMAND" ] || (echo "Running custom command: $CUSTOM_COMMAND" && $CUSTOM_COMMAND)) && \
echo '#!/bin/sh' > /install.sh && echo "npm install -g npm || (npm cache clean -f && false)" >> /install.sh && chmod +x /install.sh && /try.sh /install.sh && rm /install.sh echo '#!/bin/sh' > /install.sh && echo "npm install -g npm || (npm cache clean -f && false)" >> /install.sh && chmod +x /install.sh && /try.sh /install.sh && rm /install.sh
# Build the base environment for application libraries # Build the base environment for application libraries