From bb1250131e6a52b997e570f358631190c3d74505 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 04:21:10 +0000 Subject: [PATCH 01/44] chore(deps): bump golang from 1.18.1-buster to 1.18.2-buster Bumps golang from 1.18.1-buster to 1.18.2-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index ebab3ff..eeb4ff2 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,4 +1,4 @@ -FROM golang:1.18.1-buster +FROM golang:1.18.2-buster # hadolint ignore=DL3027 RUN apt-get update \ From a89c3db0445805ee78cfb37e46671d158efe57ac Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 21 May 2022 02:23:50 -0400 Subject: [PATCH 02/44] feat: add support for raspbian/bullseye on arm64 architectures Refs dokku/dokku#5185 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 811aec1..e992e59 100644 --- a/Makefile +++ b/Makefile @@ -217,6 +217,7 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_arm64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb From 252145f45349a7397af94cfae582c791ede1baa0 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 21 May 2022 03:50:42 -0400 Subject: [PATCH 03/44] fix: publish arm64 packages for debian instead of raspbian Raspbian 64-bit is actually based on Debian, so we need to use the correct OS Identifier or packages won't be detected. Closes #5185 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e992e59..b03d151 100644 --- a/Makefile +++ b/Makefile @@ -217,7 +217,7 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_arm64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_arm64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb From 970d9b69255b5e7f07f2752491e688224773890c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Jul 2022 04:24:32 +0000 Subject: [PATCH 04/44] chore(deps): bump golang from 1.18.2-buster to 1.18.4-buster Bumps golang from 1.18.2-buster to 1.18.4-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index eeb4ff2..d5aad86 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,4 +1,4 @@ -FROM golang:1.18.2-buster +FROM golang:1.18.4-buster # hadolint ignore=DL3027 RUN apt-get update \ From e428fc8041f4c4455b69c7d877642b7a4414e3fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 04:22:33 +0000 Subject: [PATCH 05/44] chore(deps): bump github.com/akamensky/argparse from 1.3.1 to 1.3.2 Bumps [github.com/akamensky/argparse](https://github.com/akamensky/argparse) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/akamensky/argparse/releases) - [Commits](https://github.com/akamensky/argparse/compare/v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: github.com/akamensky/argparse dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8981670..b25d24f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module procfile-util go 1.18 require ( - github.com/akamensky/argparse v1.3.1 + github.com/akamensky/argparse v1.3.2 github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 github.com/joho/godotenv v1.4.0 gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 diff --git a/go.sum b/go.sum index 6c033c8..16667b0 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/akamensky/argparse v1.3.1 h1:kP6+OyvR0fuBH6UhbE6yh/nskrDEIQgEA1SUXDPjx4g= -github.com/akamensky/argparse v1.3.1/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA= +github.com/akamensky/argparse v1.3.2 h1:VnEWYHh7x3QJrNQevKn2ygzq98cIR464CMCQZfrtNrI= +github.com/akamensky/argparse v1.3.2/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA= github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0= github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 h1:axBiC50cNZOs7ygH5BgQp4N+aYrZ2DNpWZ1KG3VOSOM= From 0e8ebd2c582667d1c8ca8a87ada4f8ef5bfe4846 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 04:20:27 +0000 Subject: [PATCH 06/44] chore(deps): bump golang from 1.18.4-buster to 1.19.0-buster Bumps golang from 1.18.4-buster to 1.19.0-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index d5aad86..945e7ab 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,4 +1,4 @@ -FROM golang:1.18.4-buster +FROM golang:1.19.0-buster # hadolint ignore=DL3027 RUN apt-get update \ From ea0c8c80bba0d50291fc77a1ff8d1421d74ae105 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Aug 2022 04:21:28 +0000 Subject: [PATCH 07/44] chore(deps): bump github.com/akamensky/argparse from 1.3.2 to 1.3.3 Bumps [github.com/akamensky/argparse](https://github.com/akamensky/argparse) from 1.3.2 to 1.3.3. - [Release notes](https://github.com/akamensky/argparse/releases) - [Commits](https://github.com/akamensky/argparse/compare/v1.3.2...v1.3.3) --- updated-dependencies: - dependency-name: github.com/akamensky/argparse dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b25d24f..c5475cb 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module procfile-util go 1.18 require ( - github.com/akamensky/argparse v1.3.2 + github.com/akamensky/argparse v1.3.3 github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 github.com/joho/godotenv v1.4.0 gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 diff --git a/go.sum b/go.sum index 16667b0..8a99f24 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/akamensky/argparse v1.3.2 h1:VnEWYHh7x3QJrNQevKn2ygzq98cIR464CMCQZfrtNrI= -github.com/akamensky/argparse v1.3.2/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA= +github.com/akamensky/argparse v1.3.3 h1:0B8DxDdLFC13hYMEXHTtXmylLvni70Zr4QYNUHkySmk= +github.com/akamensky/argparse v1.3.3/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA= github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0= github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 h1:axBiC50cNZOs7ygH5BgQp4N+aYrZ2DNpWZ1KG3VOSOM= From e56f372c956125b5e21471a8eb3c9ef01d98e14c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 8 Aug 2022 16:15:52 -0400 Subject: [PATCH 08/44] chore: update go version and all modules --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c5475cb..fd11e12 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module procfile-util -go 1.18 +go 1.19 require ( github.com/akamensky/argparse v1.3.3 From 1ebadd76bd9db38778a14ef7822fbbe992e3f610 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 8 Aug 2022 16:33:13 -0400 Subject: [PATCH 09/44] chore: unify ci config with other repositories --- .github/ISSUE_TEMPLATE/bug_report.yaml | 37 +++++++++++ .github/ISSUE_TEMPLATE/feature_request.yaml | 18 ++++++ .github/linters/.markdown-lint.yml | 6 ++ .github/linters/.yamllint.yml | 5 ++ .github/workflows/codeql-analysis.yml | 70 +++++++++++++++++++++ .github/workflows/lint.yml | 68 ++++++++++++++++++++ 6 files changed, 204 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yaml create mode 100644 .github/linters/.markdown-lint.yml create mode 100644 .github/linters/.yamllint.yml create mode 100644 .github/workflows/codeql-analysis.yml create mode 100644 .github/workflows/lint.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml new file mode 100644 index 0000000..973354a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -0,0 +1,37 @@ +--- +name: Bug Report +description: File a bug report +labels: ["needs: investigation", "type: bug"] +body: + - type: markdown + attributes: + value: | + Consider [sponsoring Dokku](https://github.com/sponsors/dokku). Sponsorship goes directly to supporting activities such as fixing bugs and general maintenance. + - type: textarea + id: description + attributes: + label: Description of problem + description: What happened? What did you expect to happen? + validations: + required: true + - type: textarea + id: steps + attributes: + label: Steps to reproduce + description: What are the steps that we need to follow to reproduce this issue? + validations: + required: true + - type: textarea + id: report-output + attributes: + label: procfile-util --version + description: Please paste the output of the command `procfile-util --version` + validations: + required: true + - type: textarea + id: logs + attributes: + label: "Output of failing command" + render: shell + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml new file mode 100644 index 0000000..7e3ee6d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -0,0 +1,18 @@ +--- +name: Feature Request +description: Have an idea for a new feature? Ask away! +labels: ["needs: plan", "type: enhancement"] +body: + - type: markdown + attributes: + value: | + While pull requests are always welcome, feel free to fill this out with an idea of what you would like to happen and we can discuss if and how it should be implemented in `procfile-util`. + + Consider [sponsoring Dokku](https://github.com/sponsors/dokku). Sponsorship goes directly to supporting activities such as implementing new features and upgrading existing functionality. + - type: textarea + id: description + attributes: + label: Description of feature + description: When you perform what command or action, what do you think should happen? + validations: + required: true diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml new file mode 100644 index 0000000..7453638 --- /dev/null +++ b/.github/linters/.markdown-lint.yml @@ -0,0 +1,6 @@ +--- +default: true + +# Line length +# https://github.com/DavidAnson/markdownlint/blob/master/doc/Rules.md#md013 +MD013: false diff --git a/.github/linters/.yamllint.yml b/.github/linters/.yamllint.yml new file mode 100644 index 0000000..75da2b7 --- /dev/null +++ b/.github/linters/.yamllint.yml @@ -0,0 +1,5 @@ +--- +extends: default + +rules: + line-length: disable diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000..039a207 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,70 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '31 22 * * 5' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'go' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..094d2ae --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,68 @@ +--- +name: 'lint' + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + hadolint: + name: hadolint + runs-on: ubuntu-20.04 + steps: + - name: Clone + uses: actions/checkout@v2 + - name: Run hadolint + uses: hadolint/hadolint-action@c27bd9edc1e95eed30474db8f295ff5807ebca14 + # v1.5.0 => c27bd9edc1e95eed30474db8f295ff5807ebca14 + + markdown-lint: + name: markdown-lint + runs-on: ubuntu-20.04 + steps: + - name: Clone + uses: actions/checkout@v2 + - name: Run markdown-lint + uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb + # v1.5.0 => 04d43ee9191307b50935a753da3b775ab695eceb + with: + config: '.github/linters/.markdown-lint.yml' + args: './README.md' + + shellcheck: + name: shellcheck + runs-on: ubuntu-20.04 + steps: + - name: Clone + uses: actions/checkout@v2 + - name: Run shellcheck + uses: ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9 + # 1.1.0 => 94e0aab03ca135d11a35e5bfc14e6746dc56e7e9 + env: + SHELLCHECK_OPTS: -s bash + shfmt: + name: shfmt + runs-on: ubuntu-20.04 + steps: + - name: Clone + uses: actions/checkout@v2 + - name: Run shfmt + uses: luizm/action-sh-checker@7f44869033b40ee4ffe7dc76c87a1bc66e3d025a + # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a + env: + GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} + SHFMT_OPTS: -l -d -i 2 + with: + sh_checker_shellcheck_disable: true + sh_checker_comment: true + + yamllint: + name: yamllint + runs-on: ubuntu-20.04 + steps: + - name: Clone + uses: actions/checkout@v2 + - name: Run yamllint + uses: ibiqlik/action-yamllint@c19bd0523a9011c3a3960fe6640a0882b59af15d + # v3.0.2 => c19bd0523a9011c3a3960fe6640a0882b59af15d + with: + config_file: '.github/linters/.yamllint.yml' From c88ed550bd0b27fb358e4eadadaf545bcf2fca1c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 8 Aug 2022 16:38:55 -0400 Subject: [PATCH 10/44] chore: rename Dockerfile.build and fix hadolint issues --- Dockerfile | 15 +++++++++++++++ Dockerfile.build | 12 ------------ Makefile | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 Dockerfile delete mode 100644 Dockerfile.build diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..8c63bfb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM golang:1.19.0-buster + +# hadolint ignore=DL3027 +RUN apt-get update \ + && apt install apt-transport-https build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby -qy \ + && git clone https://github.com/bats-core/bats-core.git /tmp/bats-core \ + && cd /tmp/bats-core \ + && ./install.sh /usr/local \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +# hadolint ignore=DL3028 +RUN gem install --no-ri --no-rdoc --quiet rake fpm package_cloud + +WORKDIR /src diff --git a/Dockerfile.build b/Dockerfile.build deleted file mode 100644 index 945e7ab..0000000 --- a/Dockerfile.build +++ /dev/null @@ -1,12 +0,0 @@ -FROM golang:1.19.0-buster - -# hadolint ignore=DL3027 -RUN apt-get update \ - && apt install apt-transport-https bats build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby -qy \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -# hadolint ignore=DL3028 -RUN gem install --no-ri --no-rdoc --quiet rake fpm package_cloud - -WORKDIR /src diff --git a/Makefile b/Makefile index b03d151..04295c2 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ build: prebuild @$(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build-docker-image: - docker build --rm -q -f Dockerfile.build -t $(IMAGE_NAME):build . + docker build --rm -q -f Dockerfile -t $(IMAGE_NAME):build . $(targets): %-in-docker: .env.docker docker run \ From 3c71f3a950b55fbe91102bbc7384e659533ea56e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 8 Aug 2022 16:43:31 -0400 Subject: [PATCH 11/44] fix: do not cd in RUN command --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c63bfb..59b408f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,7 @@ FROM golang:1.19.0-buster RUN apt-get update \ && apt install apt-transport-https build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby -qy \ && git clone https://github.com/bats-core/bats-core.git /tmp/bats-core \ - && cd /tmp/bats-core \ - && ./install.sh /usr/local \ + && /tmp/bats-core/install.sh /usr/local \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From 03a5bf3692721919fa1bd4804e27aa30821f0275 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 8 Aug 2022 16:50:36 -0400 Subject: [PATCH 12/44] fix: correct yaml lint issues --- .github/workflows/ci.yml | 1 + .github/workflows/codeql-analysis.yml | 60 +++++++-------------------- 2 files changed, 16 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2873345..0c2418f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ --- name: CI +# yamllint disable-line rule:truthy on: pull_request: branches: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 039a207..49b45a3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,22 +1,12 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# +--- name: "CodeQL" +# yamllint disable-line rule:truthy on: push: - branches: [ master ] + branches: [master] pull_request: - # The branches below must be a subset of the branches above - branches: [ master ] + branches: [master] schedule: - cron: '31 22 * * 5' @@ -32,39 +22,19 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'go' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://git.io/codeql-language-support + language: ['go'] steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 + - name: Autobuild + uses: github/codeql-action/autobuild@v2 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 From ac9beeb701923e27cdb83c3a3a6d27a37b030a29 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 8 Aug 2022 16:52:44 -0400 Subject: [PATCH 13/44] fix: correct yaml lint issues --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c2418f..e87af0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,24 +22,24 @@ jobs: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} steps: - - uses: actions/checkout@v2 - - name: make version - run: | - make version .env.docker - - run: make ci-report - - run: make build-docker-image - - run: make build-in-docker - - run: make validate-in-docker - - name: upload packages - uses: actions/upload-artifact@v2 - with: - name: build - path: build/**/* - - name: make release-in-docker - run: | - if [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then - export CI_BRANCH=${GITHUB_REF#refs/heads/} - export PACKAGECLOUD_REPOSITORY=dokku/dokku - rm .env.docker - make .env.docker release-in-docker release-packagecloud-in-docker - fi + - uses: actions/checkout@v2 + - name: make version + run: | + make version .env.docker + - run: make ci-report + - run: make build-docker-image + - run: make build-in-docker + - run: make validate-in-docker + - name: upload packages + uses: actions/upload-artifact@v2 + with: + name: build + path: build/**/* + - name: make release-in-docker + run: | + if [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then + export CI_BRANCH=${GITHUB_REF#refs/heads/} + export PACKAGECLOUD_REPOSITORY=dokku/dokku + rm .env.docker + make .env.docker release-in-docker release-packagecloud-in-docker + fi From 9b4f9113ecd0a32d173327e9aac2f99e8edb1ee4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 04:21:36 +0000 Subject: [PATCH 14/44] chore(deps): bump github.com/akamensky/argparse from 1.3.3 to 1.4.0 Bumps [github.com/akamensky/argparse](https://github.com/akamensky/argparse) from 1.3.3 to 1.4.0. - [Release notes](https://github.com/akamensky/argparse/releases) - [Commits](https://github.com/akamensky/argparse/compare/v1.3.3...v1.4.0) --- updated-dependencies: - dependency-name: github.com/akamensky/argparse dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fd11e12..47c0e48 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module procfile-util go 1.19 require ( - github.com/akamensky/argparse v1.3.3 + github.com/akamensky/argparse v1.4.0 github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 github.com/joho/godotenv v1.4.0 gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 diff --git a/go.sum b/go.sum index 8a99f24..848e41f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/akamensky/argparse v1.3.3 h1:0B8DxDdLFC13hYMEXHTtXmylLvni70Zr4QYNUHkySmk= -github.com/akamensky/argparse v1.3.3/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA= +github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc= +github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA= github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0= github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 h1:axBiC50cNZOs7ygH5BgQp4N+aYrZ2DNpWZ1KG3VOSOM= From 3c872b4a3b3c96423b6e59b8d2345e052ff657c0 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 24 Oct 2022 16:17:10 -0400 Subject: [PATCH 15/44] feat: upgrade to bullseye --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 59b408f..45bfdc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.0-buster +FROM golang:1.19.2-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 886db47a5d2b3fdf3996197e898bd671775b99d4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 24 Oct 2022 16:22:07 -0400 Subject: [PATCH 16/44] chore: drop no-ri flag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45bfdc9..0a4a5bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,6 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3028 -RUN gem install --no-ri --no-rdoc --quiet rake fpm package_cloud +RUN gem install --no-rdoc --quiet rake fpm package_cloud WORKDIR /src From 29e03e6aecdd94bc3652da4c25a4647d5c9b23bc Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 24 Oct 2022 16:25:24 -0400 Subject: [PATCH 17/44] chore: drop no-rdoc flag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0a4a5bd..225c28d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,6 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3028 -RUN gem install --no-rdoc --quiet rake fpm package_cloud +RUN gem install --quiet rake fpm package_cloud WORKDIR /src From 4d5b823feedf1c13d337c669708d1df719532087 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 04:06:18 +0000 Subject: [PATCH 18/44] chore(deps): bump golang from 1.19.2-bullseye to 1.19.4-bullseye Bumps golang from 1.19.2-bullseye to 1.19.4-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 225c28d..88c49bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.2-bullseye +FROM golang:1.19.4-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 14a54c907b4f461451e18831d10fddd06cafb427 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Mon, 2 Jan 2023 02:10:12 -0500 Subject: [PATCH 19/44] feat: update all workflows --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a0a2867..99b6fb4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,7 @@ updates: directory: "/" schedule: interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" From cd5b7553c9f2e653343a1cf5a6f7c754d4ffbbf4 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Mon, 2 Jan 2023 02:10:55 -0500 Subject: [PATCH 20/44] fix: ensure we can run git commands from mounted docker volume --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 04295c2..9a4a176 100644 --- a/Makefile +++ b/Makefile @@ -249,5 +249,7 @@ validate: bats test.bats prebuild: + git config --global --add safe.directory $(shell pwd) + git status go install github.com/go-bindata/go-bindata/...@latest cd export && go-bindata -pkg export templates/... From 6a092cccfebb887607079917e7547b2ddb666efe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 07:17:52 +0000 Subject: [PATCH 21/44] chore(deps): bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/lint.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e87af0c..fd0645f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: make version run: | make version .env.docker diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 094d2ae..17423d1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Run hadolint uses: hadolint/hadolint-action@c27bd9edc1e95eed30474db8f295ff5807ebca14 # v1.5.0 => c27bd9edc1e95eed30474db8f295ff5807ebca14 @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Run markdown-lint uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0 => 04d43ee9191307b50935a753da3b775ab695eceb @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Run shellcheck uses: ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9 # 1.1.0 => 94e0aab03ca135d11a35e5bfc14e6746dc56e7e9 @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Run shfmt uses: luizm/action-sh-checker@7f44869033b40ee4ffe7dc76c87a1bc66e3d025a # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Run yamllint uses: ibiqlik/action-yamllint@c19bd0523a9011c3a3960fe6640a0882b59af15d # v3.0.2 => c19bd0523a9011c3a3960fe6640a0882b59af15d From 13636d7fb866b677b4ededdb4b1da269f17bc83f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 07:17:54 +0000 Subject: [PATCH 22/44] chore(deps): bump ibiqlik/action-yamllint from 3.0.2 to 3.1.1 Bumps [ibiqlik/action-yamllint](https://github.com/ibiqlik/action-yamllint) from 3.0.2 to 3.1.1. - [Release notes](https://github.com/ibiqlik/action-yamllint/releases) - [Commits](https://github.com/ibiqlik/action-yamllint/compare/c19bd0523a9011c3a3960fe6640a0882b59af15d...2576378a8e339169678f9939646ee3ee325e845c) --- updated-dependencies: - dependency-name: ibiqlik/action-yamllint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 094d2ae..23a0038 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -62,7 +62,7 @@ jobs: - name: Clone uses: actions/checkout@v2 - name: Run yamllint - uses: ibiqlik/action-yamllint@c19bd0523a9011c3a3960fe6640a0882b59af15d + uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c # v3.0.2 => c19bd0523a9011c3a3960fe6640a0882b59af15d with: config_file: '.github/linters/.yamllint.yml' From 0612444fc0ff2416f7afe17bfa4322d01c0a074a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 07:17:57 +0000 Subject: [PATCH 23/44] chore(deps): bump actions/upload-artifact from 2 to 3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e87af0c..817fda4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - run: make build-in-docker - run: make validate-in-docker - name: upload packages - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build path: build/**/* From c64117d9ff65c77c6d1142b92fac52407558999c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 07:26:47 +0000 Subject: [PATCH 24/44] chore(deps): bump luizm/action-sh-checker from 0.3.0 to 0.5.0 Bumps [luizm/action-sh-checker](https://github.com/luizm/action-sh-checker) from 0.3.0 to 0.5.0. - [Release notes](https://github.com/luizm/action-sh-checker/releases) - [Commits](https://github.com/luizm/action-sh-checker/compare/7f44869033b40ee4ffe7dc76c87a1bc66e3d025a...edd0e45ecff35b05f162052b50df50976c1b74fc) --- updated-dependencies: - dependency-name: luizm/action-sh-checker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0371aae..e2cb0d7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -46,7 +46,7 @@ jobs: - name: Clone uses: actions/checkout@v3 - name: Run shfmt - uses: luizm/action-sh-checker@7f44869033b40ee4ffe7dc76c87a1bc66e3d025a + uses: luizm/action-sh-checker@edd0e45ecff35b05f162052b50df50976c1b74fc # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a env: GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} From a08886aba4ef1c914ecdbde58cafc1ae8b4ede73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 07:26:48 +0000 Subject: [PATCH 25/44] chore(deps): bump hadolint/hadolint-action from 1.5.0 to 3.0.0 Bumps [hadolint/hadolint-action](https://github.com/hadolint/hadolint-action) from 1.5.0 to 3.0.0. - [Release notes](https://github.com/hadolint/hadolint-action/releases) - [Changelog](https://github.com/hadolint/hadolint-action/blob/master/.releaserc) - [Commits](https://github.com/hadolint/hadolint-action/compare/c27bd9edc1e95eed30474db8f295ff5807ebca14...4b5806eb9c6bee4954fc0e0cc3ad6175fc9782c1) --- updated-dependencies: - dependency-name: hadolint/hadolint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0371aae..c65b577 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: - name: Clone uses: actions/checkout@v3 - name: Run hadolint - uses: hadolint/hadolint-action@c27bd9edc1e95eed30474db8f295ff5807ebca14 + uses: hadolint/hadolint-action@4b5806eb9c6bee4954fc0e0cc3ad6175fc9782c1 # v1.5.0 => c27bd9edc1e95eed30474db8f295ff5807ebca14 markdown-lint: From 854fd39b417a8748522224c5f874b48666607c7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 04:06:55 +0000 Subject: [PATCH 26/44] chore(deps): bump golang from 1.19.4-bullseye to 1.19.5-bullseye Bumps golang from 1.19.4-bullseye to 1.19.5-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 88c49bf..ca2d0e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.4-bullseye +FROM golang:1.19.5-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 7f84cf794728fa2fdf8ecc47bbbcdaae630dece4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 16 Jan 2023 02:39:08 -0500 Subject: [PATCH 27/44] chore: drop rpm support --- Dockerfile | 2 +- Makefile | 31 +------------------------------ 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca2d0e1..333813a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.19.5-bullseye # hadolint ignore=DL3027 RUN apt-get update \ - && apt install apt-transport-https build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby -qy \ + && apt install apt-transport-https build-essential curl gnupg2 jq lintian rsync rubygems-integration ruby-dev ruby -qy \ && git clone https://github.com/bats-core/bats-core.git /tmp/bats-core \ && /tmp/bats-core/install.sh /usr/local \ && apt-get clean \ diff --git a/Makefile b/Makefile index 9a4a176..7939131 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,6 @@ build: prebuild @$(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb @$(MAKE) build/deb/$(NAME)_$(VERSION)_arm64.deb @$(MAKE) build/deb/$(NAME)_$(VERSION)_armhf.deb - @$(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build-docker-image: docker build --rm -q -f Dockerfile -t $(IMAGE_NAME):build . @@ -149,27 +148,6 @@ build/deb/$(NAME)_$(VERSION)_armhf.deb: build/linux/$(NAME)-armhf build/linux/$(NAME)-armhf=/usr/bin/$(NAME) \ LICENSE=/usr/share/doc/$(NAME)/copyright -build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm: build/linux/$(NAME)-amd64 - export SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct) \ - && mkdir -p build/rpm \ - && fpm \ - --architecture x86_64 \ - --category utils \ - --description "$$PACKAGE_DESCRIPTION" \ - --input-type dir \ - --license 'MIT License' \ - --maintainer "$(MAINTAINER_NAME) <$(EMAIL)>" \ - --name $(NAME) \ - --output-type rpm \ - --package build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm \ - --rpm-os linux \ - --url "https://github.com/$(MAINTAINER)/$(REPOSITORY)" \ - --vendor "" \ - --version $(VERSION) \ - --verbose \ - build/linux/$(NAME)-amd64=/usr/bin/$(NAME) \ - LICENSE=/usr/share/doc/$(NAME)/copyright - clean: rm -rf build release validation @@ -200,13 +178,11 @@ release: build bin/gh-release bin/gh-release-body cp build/deb/$(NAME)_$(VERSION)_amd64.deb release/$(NAME)_$(VERSION)_amd64.deb cp build/deb/$(NAME)_$(VERSION)_arm64.deb release/$(NAME)_$(VERSION)_arm64.deb cp build/deb/$(NAME)_$(VERSION)_armhf.deb release/$(NAME)_$(VERSION)_armhf.deb - cp build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm release/$(NAME)-$(VERSION)-1.x86_64.rpm bin/gh-release create $(MAINTAINER)/$(REPOSITORY) $(VERSION) $(shell git rev-parse --abbrev-ref HEAD) bin/gh-release-body $(MAINTAINER)/$(REPOSITORY) v$(VERSION) release-packagecloud: @$(MAKE) release-packagecloud-deb - @$(MAKE) release-packagecloud-rpm release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAME)_$(VERSION)_arm64.deb build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_amd64.deb @@ -223,9 +199,6 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_armhf.deb -release-packagecloud-rpm: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm - package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7 build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm - validate: mkdir -p validation lintian build/deb/$(NAME)_$(VERSION)_amd64.deb || true @@ -240,12 +213,10 @@ validate: cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_amd64.deb cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_arm64.deb cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_armhf.deb - cd validation && rpm2cpio ../build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm > $(NAME)-$(VERSION)-1.x86_64.cpio - ls -lah build/deb build/rpm validation + ls -lah build/deb validation sha1sum build/deb/$(NAME)_$(VERSION)_amd64.deb sha1sum build/deb/$(NAME)_$(VERSION)_arm64.deb sha1sum build/deb/$(NAME)_$(VERSION)_armhf.deb - sha1sum build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm bats test.bats prebuild: From bb2aa5dfef0c5fe93943e015b7d024c3fc72409c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 17 Jan 2023 03:36:34 -0500 Subject: [PATCH 28/44] feat: add darwin/arm64 support --- Makefile | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7939131..4eba31e 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,8 @@ targets = $(addsuffix -in-docker, $(LIST)) @echo "VERSION=$(VERSION)" >> .env.docker build: prebuild - @$(MAKE) build/darwin/$(NAME) + @$(MAKE) build/darwin/$(NAME)-amd64 + @$(MAKE) build/darwin/$(NAME)-arm64 @$(MAKE) build/linux/$(NAME)-amd64 @$(MAKE) build/linux/$(NAME)-arm64 @$(MAKE) build/linux/$(NAME)-armhf @@ -64,15 +65,21 @@ $(targets): %-in-docker: .env.docker --workdir /src/github.com/$(MAINTAINER)/$(REPOSITORY) \ $(IMAGE_NAME):build make -e $(@:-in-docker=) -build/darwin/$(NAME): +build/darwin/$(NAME)-amd64: mkdir -p build/darwin - CGO_ENABLED=0 GOOS=darwin go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \ + CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \ -ldflags "-s -w -X main.Version=$(VERSION)" \ - -o build/darwin/$(NAME) + -o build/darwin/$(NAME)-amd64 + +build/darwin/$(NAME)-arm64: + mkdir -p build/darwin + CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \ + -ldflags "-s -w -X main.Version=$(VERSION)" \ + -o build/darwin/$(NAME)-arm64 build/linux/$(NAME)-amd64: mkdir -p build/linux - CGO_ENABLED=0 GOOS=linux go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \ + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \ -ldflags "-s -w -X main.Version=$(VERSION)" \ -o build/linux/$(NAME)-amd64 @@ -174,7 +181,8 @@ release: build bin/gh-release bin/gh-release-body tar -zcf release/$(NAME)_$(VERSION)_linux_amd64.tgz -C build/linux $(NAME)-amd64 tar -zcf release/$(NAME)_$(VERSION)_linux_arm64.tgz -C build/linux $(NAME)-arm64 tar -zcf release/$(NAME)_$(VERSION)_linux_armhf.tgz -C build/linux $(NAME)-armhf - tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME) + tar -zcf release/$(NAME)_$(VERSION)_darwin_amd64.tgz -C build/darwin $(NAME)-amd64 + tar -zcf release/$(NAME)_$(VERSION)_darwin_arm64.tgz -C build/darwin $(NAME)-arm64 cp build/deb/$(NAME)_$(VERSION)_amd64.deb release/$(NAME)_$(VERSION)_amd64.deb cp build/deb/$(NAME)_$(VERSION)_arm64.deb release/$(NAME)_$(VERSION)_arm64.deb cp build/deb/$(NAME)_$(VERSION)_armhf.deb release/$(NAME)_$(VERSION)_armhf.deb From d61fdbe775292717475e63ab5c6f018bb07f7280 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 04:10:22 +0000 Subject: [PATCH 29/44] chore(deps): bump hadolint/hadolint-action from 3.0.0 to 3.1.0 Bumps [hadolint/hadolint-action](https://github.com/hadolint/hadolint-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/hadolint/hadolint-action/releases) - [Changelog](https://github.com/hadolint/hadolint-action/blob/master/.releaserc) - [Commits](https://github.com/hadolint/hadolint-action/compare/4b5806eb9c6bee4954fc0e0cc3ad6175fc9782c1...54c9adbab1582c2ef04b2016b760714a4bfde3cf) --- updated-dependencies: - dependency-name: hadolint/hadolint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3b03b30..2788f07 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: - name: Clone uses: actions/checkout@v3 - name: Run hadolint - uses: hadolint/hadolint-action@4b5806eb9c6bee4954fc0e0cc3ad6175fc9782c1 + uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf # v1.5.0 => c27bd9edc1e95eed30474db8f295ff5807ebca14 markdown-lint: From 0dd45cb1f6539ee75cc0b9c4976ae050edf51974 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 04:28:11 +0000 Subject: [PATCH 30/44] chore(deps): bump ludeeus/action-shellcheck from 1.1.0 to 2.0.0 Bumps [ludeeus/action-shellcheck](https://github.com/ludeeus/action-shellcheck) from 1.1.0 to 2.0.0. - [Release notes](https://github.com/ludeeus/action-shellcheck/releases) - [Commits](https://github.com/ludeeus/action-shellcheck/compare/94e0aab03ca135d11a35e5bfc14e6746dc56e7e9...00cae500b08a931fb5698e11e79bfbd38e612a38) --- updated-dependencies: - dependency-name: ludeeus/action-shellcheck dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2788f07..b84ada2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -35,7 +35,7 @@ jobs: - name: Clone uses: actions/checkout@v3 - name: Run shellcheck - uses: ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9 + uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 1.1.0 => 94e0aab03ca135d11a35e5bfc14e6746dc56e7e9 env: SHELLCHECK_OPTS: -s bash From d2e5f9d6f2be3045dd78ce07361cdf842b61b15a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 04:03:20 +0000 Subject: [PATCH 31/44] chore(deps): bump golang from 1.19.5-bullseye to 1.20.0-bullseye Bumps golang from 1.19.5-bullseye to 1.20.0-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 333813a..5585f3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.5-bullseye +FROM golang:1.20.0-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 371a68c36bed3dc8c7d6d3dcb3ac0f122a998a4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 04:10:57 +0000 Subject: [PATCH 32/44] chore(deps): bump github.com/joho/godotenv from 1.4.0 to 1.5.1 Bumps [github.com/joho/godotenv](https://github.com/joho/godotenv) from 1.4.0 to 1.5.1. - [Release notes](https://github.com/joho/godotenv/releases) - [Commits](https://github.com/joho/godotenv/compare/v1.4.0...v1.5.1) --- updated-dependencies: - dependency-name: github.com/joho/godotenv dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 47c0e48..386a1ee 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/akamensky/argparse v1.4.0 github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 - github.com/joho/godotenv v1.4.0 + github.com/joho/godotenv v1.5.1 gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 ) diff --git a/go.sum b/go.sum index 848e41f..757316a 100644 --- a/go.sum +++ b/go.sum @@ -4,7 +4,7 @@ github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVK github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 h1:axBiC50cNZOs7ygH5BgQp4N+aYrZ2DNpWZ1KG3VOSOM= github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2/go.mod h1:jnzFpU88PccN/tPPhCpnNU8mZphvKxYM9lLNkd8e+os= -github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= -github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 h1:8ajkpB4hXVftY5ko905id+dOnmorcS2CHNxxHLLDcFM= gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61/go.mod h1:IfMagxm39Ys4ybJrDb7W3Ob8RwxftP0Yy+or/NVz1O8= From 2e0635caada71e08fcf1387ac20dde84e8245bc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 05:00:07 +0000 Subject: [PATCH 33/44] chore(deps): bump golang from 1.20.0-bullseye to 1.20.1-bullseye Bumps golang from 1.20.0-bullseye to 1.20.1-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5585f3f..0845ec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.0-bullseye +FROM golang:1.20.1-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 6d143b4c371219b73a28669c50e94e2d78d92de3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 05:23:02 +0000 Subject: [PATCH 34/44] chore(deps): bump luizm/action-sh-checker from 0.5.0 to 0.7.0 Bumps [luizm/action-sh-checker](https://github.com/luizm/action-sh-checker) from 0.5.0 to 0.7.0. - [Release notes](https://github.com/luizm/action-sh-checker/releases) - [Commits](https://github.com/luizm/action-sh-checker/compare/edd0e45ecff35b05f162052b50df50976c1b74fc...76ab0b22e1f194e4a582edc7969df6485c4e9246) --- updated-dependencies: - dependency-name: luizm/action-sh-checker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b84ada2..b84ab17 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -46,7 +46,7 @@ jobs: - name: Clone uses: actions/checkout@v3 - name: Run shfmt - uses: luizm/action-sh-checker@edd0e45ecff35b05f162052b50df50976c1b74fc + uses: luizm/action-sh-checker@76ab0b22e1f194e4a582edc7969df6485c4e9246 # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a env: GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} From 8e521e7412f74153064825bfcbeb8d1723b89f4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 05:00:48 +0000 Subject: [PATCH 35/44] chore(deps): bump golang from 1.20.1-bullseye to 1.20.2-bullseye Bumps golang from 1.20.1-bullseye to 1.20.2-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0845ec6..5c8f59d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.1-bullseye +FROM golang:1.20.2-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 69a830d5d91ab611bf23a062769f74237246f767 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 05:01:32 +0000 Subject: [PATCH 36/44] chore(deps): bump golang from 1.20.2-bullseye to 1.20.3-bullseye Bumps golang from 1.20.2-bullseye to 1.20.3-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5c8f59d..7fb6828 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.2-bullseye +FROM golang:1.20.3-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 266ddcbaae7c5fbbaa08524c2eea294c03201396 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 May 2023 04:59:31 +0000 Subject: [PATCH 37/44] chore(deps): bump golang from 1.20.3-bullseye to 1.20.4-bullseye Bumps golang from 1.20.3-bullseye to 1.20.4-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7fb6828..5291aa3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.3-bullseye +FROM golang:1.20.4-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 575d27b01da7a8281d003e9ac3291b4d0a51d77b Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Fri, 12 May 2023 23:17:55 -0400 Subject: [PATCH 38/44] fix: do not run linting twice for pull requests --- .github/workflows/lint.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b84ab17..04d8686 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,7 +2,13 @@ name: 'lint' # yamllint disable-line rule:truthy -on: [push, pull_request] +on: + pull_request: + branches: + - '*' + push: + branches: + - 'master' jobs: hadolint: From 0db4c3661ca7b86ecddd31394908ef0ab5fbeb40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 05:02:55 +0000 Subject: [PATCH 39/44] chore(deps): bump golang from 1.20.4-bullseye to 1.20.5-bullseye Bumps golang from 1.20.4-bullseye to 1.20.5-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5291aa3..6ae9a60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.4-bullseye +FROM golang:1.20.5-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 0e02bad7271cb992ad09ed2f47ced1df71011d45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 04:38:07 +0000 Subject: [PATCH 40/44] chore(deps): bump golang from 1.20.5-bullseye to 1.20.6-bullseye Bumps golang from 1.20.5-bullseye to 1.20.6-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ae9a60..3ba6836 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.5-bullseye +FROM golang:1.20.6-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From 4da8745dde62fb51086980e5b77f9cd6a867b204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon=20S?= <6475387+Coffee2CodeNL@users.noreply.github.com> Date: Mon, 31 Jul 2023 18:55:28 +0200 Subject: [PATCH 41/44] Add Bookworm Support --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 4eba31e..053f699 100644 --- a/Makefile +++ b/Makefile @@ -199,9 +199,11 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_arm64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb From e1416ef097656ed38fbc9ba7c04137511f607d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon=20S?= <6475387+Coffee2CodeNL@users.noreply.github.com> Date: Mon, 31 Jul 2023 19:21:28 +0200 Subject: [PATCH 42/44] Tabs instead of Spaces / Yeet stretch --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 053f699..eead20d 100644 --- a/Makefile +++ b/Makefile @@ -196,14 +196,13 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_amd64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_arm64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_arm64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb From d11885750f0bf615c28e634c40ba989430d92ee5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 04:30:23 +0000 Subject: [PATCH 43/44] chore(deps): bump golang from 1.20.6-bullseye to 1.20.7-bullseye Bumps golang from 1.20.6-bullseye to 1.20.7-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3ba6836..0e971fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.6-bullseye +FROM golang:1.20.7-bullseye # hadolint ignore=DL3027 RUN apt-get update \ From e597093cb8dcdadb8d795829e55d9e089398fdd8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 6 Aug 2023 17:57:59 -0400 Subject: [PATCH 44/44] Release 0.16.0 - #100 @dependabot: chore(deps): bump golang from 1.20.4-bullseye to 1.20.5-bullseye - #101 @dependabot: chore(deps): bump golang from 1.20.5-bullseye to 1.20.6-bullseye - #102 @Coffee2CodeNL: Add Bookworm Support - #103 @dependabot: chore(deps): bump golang from 1.20.6-bullseye to 1.20.7-bullseye - #60 @dependabot: chore(deps): bump golang from 1.18.1-buster to 1.18.2-buster - #61 @josegonzalez: Add support for raspbian/bullseye on arm64 architectures - #62 @josegonzalez: Publish arm64 packages for debian instead of raspbian - #65 @dependabot: chore(deps): bump golang from 1.18.2-buster to 1.18.4-buster - #66 @dependabot: chore(deps): bump github.com/akamensky/argparse from 1.3.1 to 1.3.2 - #68 @dependabot: chore(deps): bump golang from 1.18.4-buster to 1.19.0-buster - #69 @dependabot: chore(deps): bump github.com/akamensky/argparse from 1.3.2 to 1.3.3 - #70 @josegonzalez: chore: update go version and all modules - #71 @josegonzalez: chore: unify ci config with other repositories - #73 @dependabot: chore(deps): bump github.com/akamensky/argparse from 1.3.3 to 1.4.0 - #76 @josegonzalez: Upgrade to bullseye - #78 @dependabot: chore(deps): bump golang from 1.19.2-bullseye to 1.19.4-bullseye - #79 @josegonzalez: Update all workflows - #80 @josegonzalez: Ensure we can run git commands from mounted docker volume - #81 @dependabot: chore(deps): bump actions/checkout from 2 to 3 - #82 @dependabot: chore(deps): bump ibiqlik/action-yamllint from 3.0.2 to 3.1.1 - #83 @dependabot: chore(deps): bump actions/upload-artifact from 2 to 3 - #84 @dependabot: chore(deps): bump luizm/action-sh-checker from 0.3.0 to 0.5.0 - #85 @dependabot: chore(deps): bump hadolint/hadolint-action from 1.5.0 to 3.0.0 - #86 @dependabot: chore(deps): bump golang from 1.19.4-bullseye to 1.19.5-bullseye - #87 @josegonzalez: Drop rpm support - #88 @josegonzalez: Add darwin/arm64 support - #89 @dependabot: chore(deps): bump hadolint/hadolint-action from 3.0.0 to 3.1.0 - #90 @dependabot: chore(deps): bump ludeeus/action-shellcheck from 1.1.0 to 2.0.0 - #91 @dependabot: chore(deps): bump golang from 1.19.5-bullseye to 1.20.0-bullseye - #92 @dependabot: chore(deps): bump github.com/joho/godotenv from 1.4.0 to 1.5.1 - #93 @dependabot: chore(deps): bump golang from 1.20.0-bullseye to 1.20.1-bullseye - #95 @dependabot: chore(deps): bump luizm/action-sh-checker from 0.5.0 to 0.7.0 - #96 @dependabot: chore(deps): bump golang from 1.20.1-bullseye to 1.20.2-bullseye - #97 @dependabot: chore(deps): bump golang from 1.20.2-bullseye to 1.20.3-bullseye - #98 @dependabot: chore(deps): bump golang from 1.20.3-bullseye to 1.20.4-bullseye - #99 @josegonzalez: fix: do not run linting twice for pull requests --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eead20d..8daa292 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ MAINTAINER_NAME = Jose Diaz-Gonzalez REPOSITORY = procfile-util HARDWARE = $(shell uname -m) SYSTEM_NAME = $(shell uname -s | tr '[:upper:]' '[:lower:]') -BASE_VERSION ?= 0.15.0 +BASE_VERSION ?= 0.16.0 IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY) PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish