diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4083037 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +local diff --git a/ossutil/latest/Dockerfile b/ossutil/Dockerfile similarity index 53% rename from ossutil/latest/Dockerfile rename to ossutil/Dockerfile index 47d2011..5fdc0ea 100644 --- a/ossutil/latest/Dockerfile +++ b/ossutil/Dockerfile @@ -1,4 +1,11 @@ -FROM debian:stretch-slim +ARG BASE_IMAGE=debian:stretch-slim +FROM ${BASE_IMAGE} + +RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list && \ + sed -i 's|security.debian.org/debian-security|mirrors.aliyun.com/debian-security|g' /etc/apt/sources.list && \ + apt-get update && \ + apt-get install -y ca-certificates && \ + rm -rf /var/lib/apt/lists/* ARG OSSUTIL_VERSION=1.6.10 ADD http://gosspublic.alicdn.com/ossutil/${OSSUTIL_VERSION}/ossutil64 /usr/bin/ diff --git a/ossutil/latest/docker-entrypoint.sh b/ossutil/docker-entrypoint.sh old mode 100644 new mode 100755 similarity index 100% rename from ossutil/latest/docker-entrypoint.sh rename to ossutil/docker-entrypoint.sh diff --git a/ossutil/node/10/Dockerfile b/ossutil/node/10/Dockerfile deleted file mode 100644 index 214e224..0000000 --- a/ossutil/node/10/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM node:10.17.0-stretch-slim - -ARG OSSUTIL_VERSION=1.6.10 -ADD http://gosspublic.alicdn.com/ossutil/${OSSUTIL_VERSION}/ossutil64 /usr/bin/ -RUN chmod a+x /usr/bin/ossutil64 && \ - ln -s /usr/bin/ossutil64 /usr/bin/ossutil - -ENV OSS_ENDPOINT='' -ENV OSS_AK_ID='' -ENV OSS_AK_SECRET='' -ENV OSSUTIL_CONFIG_FILE='' - -COPY docker-entrypoint.sh /usr/local/bin/ -RUN chmod +x /usr/local/bin/docker-entrypoint.sh -ENTRYPOINT [ "docker-entrypoint.sh" ] diff --git a/ossutil/node/10/docker-entrypoint.sh b/ossutil/node/10/docker-entrypoint.sh deleted file mode 100644 index 6184924..0000000 --- a/ossutil/node/10/docker-entrypoint.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -set -e - -if [ -n "${OSS_ENDPOINT}" ] && [ -n "${OSS_AK_ID}" ] && [ -n "${OSS_AK_SECRET}" ]; then - if [ -n "${OSSUTIL_CONFIG_FILE}" ]; then - cfg_dir=$(dirname "${OSSUTIL_CONFIG_FILE}") - mkdir -p "$cfg_dir" - cfg_file="${OSSUTIL_CONFIG_FILE}" - else - cfg_file="${HOME}/.ossutilconfig" - fi - - ossutil config -e "${OSS_ENDPOINT}" -i "${OSS_AK_ID}" -k "${OSS_AK_SECRET}" -c "${cfg_file}" - echo "configured ossutil to ${cfg_file}" -fi - -if [ $# -gt 0 ]; then - echo "receiving comand:" "$@" - # https://stackoverflow.com/a/17529221 - ( "$@" ) -fi diff --git a/ossutil/node/12/Dockerfile b/ossutil/node/12/Dockerfile deleted file mode 100644 index e8fe4cf..0000000 --- a/ossutil/node/12/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM node:12.10.0-stretch-slim - -ARG OSSUTIL_VERSION=1.6.10 -ADD http://gosspublic.alicdn.com/ossutil/${OSSUTIL_VERSION}/ossutil64 /usr/bin/ -RUN chmod a+x /usr/bin/ossutil64 && \ - ln -s /usr/bin/ossutil64 /usr/bin/ossutil - -ENV OSS_ENDPOINT='' -ENV OSS_AK_ID='' -ENV OSS_AK_SECRET='' -ENV OSSUTIL_CONFIG_FILE='' - -COPY docker-entrypoint.sh /usr/local/bin/ -RUN chmod +x /usr/local/bin/docker-entrypoint.sh -ENTRYPOINT [ "docker-entrypoint.sh" ] diff --git a/ossutil/node/12/docker-entrypoint.sh b/ossutil/node/12/docker-entrypoint.sh deleted file mode 100644 index 6184924..0000000 --- a/ossutil/node/12/docker-entrypoint.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -set -e - -if [ -n "${OSS_ENDPOINT}" ] && [ -n "${OSS_AK_ID}" ] && [ -n "${OSS_AK_SECRET}" ]; then - if [ -n "${OSSUTIL_CONFIG_FILE}" ]; then - cfg_dir=$(dirname "${OSSUTIL_CONFIG_FILE}") - mkdir -p "$cfg_dir" - cfg_file="${OSSUTIL_CONFIG_FILE}" - else - cfg_file="${HOME}/.ossutilconfig" - fi - - ossutil config -e "${OSS_ENDPOINT}" -i "${OSS_AK_ID}" -k "${OSS_AK_SECRET}" -c "${cfg_file}" - echo "configured ossutil to ${cfg_file}" -fi - -if [ $# -gt 0 ]; then - echo "receiving comand:" "$@" - # https://stackoverflow.com/a/17529221 - ( "$@" ) -fi