diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85a2d21b..2fd9b4e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -172,16 +172,3 @@ jobs: with: draft: true files: ${{ env.DESTDIR }}/* - - build-deb: - runs-on: ubuntu-22.04 - steps: - - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Build - run: | - make deb diff --git a/Makefile b/Makefile index ceb860f2..844799cc 100644 --- a/Makefile +++ b/Makefile @@ -53,18 +53,6 @@ fmt: .PHONY: validate validate: lint validate-vendor fmt -BUILDIMG:=docker-credential-secretservice-$(VERSION) -.PHONY: deb -deb: - mkdir -p release - docker build -f deb/Dockerfile \ - --build-arg VERSION=$(patsubst v%,%,$(VERSION)) \ - --build-arg REVISION=$(REVISION) \ - --tag $(BUILDIMG) \ - . - docker run --rm --net=none $(BUILDIMG) tar cf - /release | tar xf - - docker rmi $(BUILDIMG) - .PHONY: vendor vendor: $(eval $@_TMP_OUT := $(shell mktemp -d -t docker-output.XXXXXXXXXX)) diff --git a/deb/Dockerfile b/deb/Dockerfile deleted file mode 100644 index c36ae0a3..00000000 --- a/deb/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -ARG GO_VERSION=1.18.5 -ARG DISTRO=ubuntu -ARG SUITE=focal - -FROM golang:${GO_VERSION}-buster AS golang - -FROM ${DISTRO}:${SUITE} - -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -yy debhelper dh-make libsecret-1-dev -RUN mkdir -p /build - -WORKDIR /build -ENV GOPROXY=https://proxy.golang.org|direct -ENV GO111MODULE=off -ENV GOPATH=/build -ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin -COPY --from=golang /usr/local/go /usr/local/go - -COPY Makefile . -COPY credentials credentials -COPY secretservice secretservice -COPY pass pass -COPY deb/debian ./debian -COPY deb/build-deb . - -ARG VERSION -ENV VERSION=${VERSION} -ARG REVISION -ENV REVISION=${REVISION} -ARG DISTRO -ENV DISTRO=${DISTRO} -ARG SUITE -ENV SUITE=${SUITE} -RUN /build/build-deb diff --git a/deb/build-deb b/deb/build-deb deleted file mode 100755 index 04d3de1d..00000000 --- a/deb/build-deb +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -set -ex - -maintainer=$(awk -F ': ' '$1 == "Maintainer" { print $2; exit }' debian/control) - -cat > "debian/changelog" <<-EOF -docker-credential-helpers ($VERSION) $DISTRO-$SUITE; urgency=low - - * New upstream version - - -- $maintainer $(date --rfc-2822) -EOF - -mkdir -p src/github.com/docker/docker-credential-helpers -ln -s /build/credentials /build/src/github.com/docker/docker-credential-helpers/credentials -ln -s /build/secretservice /build/src/github.com/docker/docker-credential-helpers/secretservice -ln -s /build/pass /build/src/github.com/docker/docker-credential-helpers/pass - -dpkg-buildpackage -us -uc - -mkdir /release -mv /docker-credential-* /release diff --git a/deb/debian/compat b/deb/debian/compat deleted file mode 100644 index ec635144..00000000 --- a/deb/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/deb/debian/control b/deb/debian/control deleted file mode 100644 index 33f2041a..00000000 --- a/deb/debian/control +++ /dev/null @@ -1,25 +0,0 @@ -Source: docker-credential-helpers -Section: admin -Priority: optional -Maintainer: Docker -Homepage: https://dockerproject.org -Standards-Version: 3.9.6 -Vcs-Browser: https://github.com/docker/docker-credential-helpers -Vcs-Git: git://github.com/docker/docker-credential-helpers.git -Build-Depends: debhelper - , dh-make - , libsecret-1-dev - -Package: docker-credential-secretservice -Architecture: any -Depends: libsecret-1-0 - , ${misc:Depends} -Description: docker-credential-secretservice is a credential helper backend - which uses libsecret to keep Docker credentials safe. - -Package: docker-credential-pass -Architecture: any -Depends: pass - , ${misc:Depends} -Description: docker-credential-secretservice is a credential helper backend - which uses the pass utility to keep Docker credentials safe. diff --git a/deb/debian/docker-credential-pass.install b/deb/debian/docker-credential-pass.install deleted file mode 100644 index fb17479b..00000000 --- a/deb/debian/docker-credential-pass.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/bin/docker-credential-pass diff --git a/deb/debian/docker-credential-secretservice.install b/deb/debian/docker-credential-secretservice.install deleted file mode 100644 index 4a17630b..00000000 --- a/deb/debian/docker-credential-secretservice.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/bin/docker-credential-secretservice diff --git a/deb/debian/rules b/deb/debian/rules deleted file mode 100755 index 4750af38..00000000 --- a/deb/debian/rules +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/make -f - -DESTDIR := $(CURDIR)/debian/tmp - -override_dh_auto_build: - make build-secretservice DESTDIR=bin - make build-pass DESTDIR=bin - -override_dh_auto_install: - install -D bin/docker-credential-secretservice $(DESTDIR)/usr/bin/docker-credential-secretservice - install -D bin/docker-credential-pass $(DESTDIR)/usr/bin/docker-credential-pass - -%: - dh $@ - -override_dh_auto_test: - # no tests -