fix: CICD pipeline

mc256 · Nov 10, 2022 · bef460d · bef460d
1 parent 9124455
commit bef460d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 44 deletions.
diff --git a/.github/.helper/.dockerignore b/.github/.helper/.dockerignore
diff --git a/.github/.helper/.gitignore b/.github/.helper/.gitignore
diff --git a/.github/.helper/Dockerfile b/.github/.helper/Dockerfile
diff --git a/.github/.helper/app.py b/.github/.helper/app.py
diff --git a/.github/.helper/requirements.txt b/.github/.helper/requirements.txt
diff --git a/.github/workflows/debian-package.yml b/.github/workflows/debian-package.yml
@@ -21,8 +21,7 @@ jobs:
           curl -fsSL https://get.docker.com -o /tmp/get-docker.sh
           sh /tmp/get-docker.sh
           docker run --privileged --rm tonistiigi/binfmt --install all
-          docker build -t helper:latest  -f ./.github/.helper/Dockerfile ./.github/.helper/
-          docker run -d --hostname helper --expose 8080 --name helper -v "$(pwd)"/sandbox:/app/upload:rw helper:latest
+          docker run -d --hostname helper --expose 8080 --name helper -v "$(pwd)"/sandbox:/app/upload:rw harbor.yuri.moe/public/helper:latest
           export UPLOAD_URL=http://`docker inspect helper | grep "IPAddress" | grep -o -E '[0-9.]+' | head -n 1`:8080/
           make docker-buildx-multi-arch
       - name: Release

diff --git a/Makefile b/Makefile
@@ -131,17 +131,17 @@ create-deb-package.arm64: change-version-number set-production build-starlight-d
 .PHONY: upload-deb-package.amd64
 upload-deb-package.amd64:
 	curl --form uploadfile='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_amd64.deb' $(UPLOAD_URL)
-	curl -X POST -u $(APT_UPLOAD_AUTH) -F starlight-snapshotter_$(VERSIONNUMBER)_amd64.deb='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_amd64.deb' https://repo.yuri.moe/api/files/starlight-snapshotter
+	#curl -X POST -u $(APT_UPLOAD_AUTH) -F starlight-snapshotter_$(VERSIONNUMBER)_amd64.deb='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_amd64.deb' https://repo.yuri.moe/api/files/starlight-snapshotter
 
 .PHONY: upload-deb-package.armv6l
 upload-deb-package.armv6l:
 	curl --form uploadfile='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_armhf.deb' $(UPLOAD_URL)
-	curl -X POST -u $(APT_UPLOAD_AUTH) -F starlight-snapshotter_$(VERSIONNUMBER)_armhf.deb='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_armhf.deb' https://repo.yuri.moe/api/files/starlight-snapshotter
+	#curl -X POST -u $(APT_UPLOAD_AUTH) -F starlight-snapshotter_$(VERSIONNUMBER)_armhf.deb='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_armhf.deb' https://repo.yuri.moe/api/files/starlight-snapshotter
 
 .PHONY: upload-deb-package.amd64
 upload-deb-package.arm64:
 	curl --form uploadfile='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_arm64.deb' $(UPLOAD_URL)
-	curl -X POST -u $(APT_UPLOAD_AUTH) -F starlight-snapshotter_$(VERSIONNUMBER)_arm64.deb='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_arm64.deb' https://repo.yuri.moe/api/files/starlight-snapshotter
+	#curl -X POST -u $(APT_UPLOAD_AUTH) -F starlight-snapshotter_$(VERSIONNUMBER)_arm64.deb='@./sandbox/starlight-snapshotter_$(VERSIONNUMBER)_arm64.deb' https://repo.yuri.moe/api/files/starlight-snapshotter
 
 ######################################################################
 .PHONY: docker-buildx-multi-arch
@@ -151,18 +151,21 @@ docker-buildx-multi-arch:
 		--build-arg ARCH=amd64 \
 		--build-arg UPLOAD_URL=$(UPLOAD_URL) \
  		--build-arg APT_UPLOAD_AUTH=$(APT_UPLOAD_AUTH)  \
+ 		--network=host \
  		-f ./demo/deb-package/Dockerfile .
 	docker buildx build \
         --platform linux/arm/v7 \
 		--build-arg ARCH=armv6l \
 		--build-arg UPLOAD_URL=$(UPLOAD_URL) \
  		--build-arg APT_UPLOAD_AUTH=$(APT_UPLOAD_AUTH)  \
+ 		--network=host \
  		-f ./demo/deb-package/Dockerfile .
 	docker buildx build \
         --platform linux/arm64/v8 \
 		--build-arg ARCH=arm64 \
 		--build-arg UPLOAD_URL=$(UPLOAD_URL) \
  		--build-arg APT_UPLOAD_AUTH=$(APT_UPLOAD_AUTH)  \
+ 		--network=host \
  		-f ./demo/deb-package/Dockerfile .
 
 ######################################################################

diff --git a/demo/deb-package/Dockerfile b/demo/deb-package/Dockerfile
@@ -15,7 +15,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
 
 RUN apt update -y && apt upgrade -y 
-RUN apt install -y tzdata curl wget git dpkg-dev gpg build-essential debhelper
+RUN apt install -y tzdata curl wget git dpkg-dev gpg build-essential debhelper bind9-utils
 RUN wget -q https://go.dev/dl/go1.18.4.linux-$ARCH.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.18.4.linux-$ARCH.tar.gz 
 COPY . .
 RUN ARCH=$ARCH && make create-deb-package.$ARCH upload-deb-package.$ARCH