Merge pull request #20 from dokku/master

Release 0.4.1
dokku · Nov 5, 2021 · 2d7b51f · 2d7b51f
2 parents 74e785d + 50f38b9
commit 2d7b51f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 85 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,4 +4,8 @@ updates:
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: true
     env:
-      GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
       PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
 
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM golang:1.17.2-buster
+FROM golang:1.17.3-buster
 
 RUN apt-get update \
     && apt install apt-transport-https build-essential curl gnupg2 lintian rpm rsync rubygems-integration ruby-dev ruby -qy \

diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
 NAME = netrc
-EMAIL = dokku@josediazgonzalez.com
+EMAIL = netrc@josediazgonzalez.com
 MAINTAINER = dokku
 MAINTAINER_NAME = Jose Diaz-Gonzalez
 REPOSITORY = netrc
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
-BASE_VERSION ?= 0.4.0
+BASE_VERSION ?= 0.4.1
 IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY)
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
 

diff --git a/README.md b/README.md
@@ -24,4 +24,4 @@ Available commands are:
 
 ## Releases
 
-Anybody can propose a release. First bump the version in `Makefile`, make sure `CHANGELOG.md` is up to date, and make sure tests are passing. Then open a Pull Request from `master` into the `release` branch. Once a maintainer approves and merges, Github Actions will build a release and upload it to Github.
+Anybody can propose a release. First bump the version in `Makefile` and make sure tests are passing. Then open a Pull Request from `master` into the `release` branch. Once a maintainer approves and merges, Github Actions will build a release and upload it to Github.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,4 @@ Available commands are:

		## Releases

		Anybody can propose a release. First bump the version in `Makefile`, make sure `CHANGELOG.md` is up to date, and make sure tests are passing. Then open a Pull Request from `master` into the `release` branch. Once a maintainer approves and merges, Github Actions will build a release and upload it to Github.
		Anybody can propose a release. First bump the version in `Makefile` and make sure tests are passing. Then open a Pull Request from `master` into the `release` branch. Once a maintainer approves and merges, Github Actions will build a release and upload it to Github.