From e0663fc7b6eeffbe91011a266247b6ce167aa1d1 Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Thu, 3 Sep 2020 16:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9select=5Fsource=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 3 ++- alpine/prebuilds/usr/sbin/select_source | 2 +- prebuilds/usr/sbin/select_source | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e6b8b88..bb28506 100644 --- a/Makefile +++ b/Makefile @@ -35,13 +35,14 @@ clearclean: clean @echo "Clean all images for current application..." @docker images | grep "$(debian_name)" | awk '{print $$3}' | xargs docker rmi -f @docker images | grep "$(alpine_name)" | awk '{print $$3}' | xargs docker rmi -f + tag: @echo "Add tag: $(local_registory)/$(alpine_name):latest" @docker tag $(debian_name) $(local_registory)/$(debian_name) @echo "Add tag: $(local_registory)/$(alpine_name):latest" @docker tag $(alpine_name) $(local_registory)/$(alpine_name) -push: +push: tag @echo "Push: $(local_registory)/$(alpine_name):latest" @docker push $(local_registory)/$(debian_name) @echo "Push: $(local_registory)/$(alpine_name):latest" diff --git a/alpine/prebuilds/usr/sbin/select_source b/alpine/prebuilds/usr/sbin/select_source index 030b8a0..ae2c236 100755 --- a/alpine/prebuilds/usr/sbin/select_source +++ b/alpine/prebuilds/usr/sbin/select_source @@ -1,4 +1,4 @@ #!/bin/sh # shell 执行参数,分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行) set -eux -cp /etc/apk/repositories.${apk_source:-default} /etc/apk/repositories \ No newline at end of file +cp /etc/apk/repositories.${1:-default} /etc/apk/repositories \ No newline at end of file diff --git a/prebuilds/usr/sbin/select_source b/prebuilds/usr/sbin/select_source index ddbe831..49ff76e 100755 --- a/prebuilds/usr/sbin/select_source +++ b/prebuilds/usr/sbin/select_source @@ -1,4 +1,4 @@ #!/bin/bash # shell 执行参数,分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行) set -eux -cp /etc/apt/sources/sources.list.${apt_source:-default} /etc/apt/sources.list; \ +cp /etc/apt/sources/sources.list.${1:-default} /etc/apt/sources.list; \