Merge pull request #1176 from gliderlabs/master

Release 0.8.0

Author: josegonzalez

.github/linters/.hadolint.yml

@@ -0,0 +1,6 @@
+ignored:
+  - DL3048
+  - DL3005
+  - DL3008
+  - DL3003
+  - SC2035

.github/linters/.markdown-lint.yml

@@ -0,0 +1,37 @@
+---
+default: true
+
+# Line length
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md013
+MD013: false
+
+# Inline HTML
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md033
+MD033: false
+
+# List indentation
+# 2 spaces breaks list formatting in mkdocs
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md007
+MD007:
+  indent: 4
+
+# Fenced code blocks should have a language specified
+# We use a second, un-languaged code block to denote the output
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md040
+MD040: false
+
+# Blank line inside blockquote
+# This is typically done when a section has a "New as of" or "Warning" in addition to a note
+# May wish to take advantage of github-style admonitions
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md028
+MD028: false
+
+# No duplicate headers
+# HISTORY.md has a ton of these
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md024
+MD024: false
+
+# First line h1
+# The issue template doesn't have one
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md041
+MD041: false

.github/linters/.yamllint.yml

@@ -0,0 +1,8 @@
+---
+extends: default
+
+rules:
+  line-length: disable
+
+ignore:
+  - plugins/scheduler-k3s/templates/*

.github/workflows/lint.yml

@@ -0,0 +1,80 @@
+---
+name: "lint"
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - "master"
+
+concurrency:
+  group: lint-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  hadolint:
+    name: hadolint
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v4
+      - name: Run hadolint
+        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        with:
+          config: .github/linters/.hadolint.yml
+
+  markdown-lint:
+    name: markdown-lint
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v4
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: ".github/workflows/lint.yml"
+      - name: Install markdownlint-cli
+        run: npm install -g [email protected]
+      - name: Run markdown-lint
+        run: markdownlint -c .github/linters/.markdown-lint.yml *.md **/*.md
+
+  shellcheck:
+    name: shellcheck
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v4
+      - name: Run shellcheck
+        uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38
+        with:
+          ignore_paths: >-
+            ./tests/unit/fixtures/.profile.d/app.sh
+
+  shfmt:
+    name: shfmt
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v4
+      - name: Run shfmt
+        uses: luizm/action-sh-checker@c6edb3de93e904488b413636d96c6a56e3ad671a
+        env:
+          SHFMT_OPTS: -l -bn -ci -i 2 -d
+        with:
+          sh_checker_shellcheck_disable: true
+
+  yamllint:
+    name: yamllint
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v4
+      - name: Run yamllint
+        uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c
+        with:
+          config_file: ".github/linters/.yamllint.yml"

.github/workflows/main.yml

@@ -51,9 +51,6 @@ jobs:
       - name: shellcheck
         run: make shellcheck
 
-      - name: lint
-        run: make lint
-
       - name: install requirements
         run: make deps fpm package_cloud
 
@@ -87,7 +84,7 @@ jobs:
           fi
 
       - name: upload packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-${{ matrix.heroku }}-${{ matrix.buildx }}
           path: build
@@ -125,7 +122,7 @@ jobs:
           go-version: 1.17.8
 
       - name: download packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-${{ matrix.heroku }}-false
           path: build

.github/workflows/tag-release.yml

@@ -50,7 +50,7 @@ jobs:
           make build build/docker/${{ matrix.heroku }} BUILDX=false STACK_VERSION=${{ matrix.heroku }}
 
       - name: upload packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-${{ matrix.heroku }}-${{ matrix.buildx }}
           path: build
@@ -68,7 +68,7 @@ jobs:
           ruby-version: 3.3
 
       - name: download packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-22-false
           path: build

.shellcheckrc

@@ -0,0 +1,7 @@
+disable=SC2128
+disable=SC1091
+disable=SC2002
+disable=SC2294
+disable=SC2034
+disable=SC2031
+disable=SC2030

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.8.0](https://github.com/gliderlabs/herokuish/compare/v0.7.6...v0.8.0) - 2024-03-28
+
+- #1093 @dependabot: chore(deps): bump actions/download-artifact from 3 to 4
+- #1173 @josegonzalez: Use find to identify only files not already owned by user
+- #1174 @josegonzalez: Add linting to CI
+- #1175 @josegonzalez: Ensure all file permissions are set to specified unprivileged user
+- #467 @mlandauer: Only copy from app import path to app path when building
+
 ## [0.7.6](https://github.com/gliderlabs/herokuish/compare/v0.7.5...v0.7.6) - 2024-03-28
 
 - #1171 @josegonzalez: Use a run mount to add build dependencies
@@ -877,7 +885,7 @@ All notable changes to this project will be documented in this file.
 
 - @michaelshobbs remove erlang from buildpack bundle
 
-**NOTE: v0.4.0 is now based on heroku-16**
+> NOTE: v0.4.0 is now based on heroku-16
 
 ## [0.3.36](https://github.com/gliderlabs/herokuish/compare/v0.3.35...v0.3.36) - 2018-03-10
 
@@ -890,7 +898,7 @@ All notable changes to this project will be documented in this file.
 - @michaelshobbs Update nodejs to version v121
 - @michaelshobbs Update go to version v85
 
-**NOTE: This will be the last version of herokuish based on cedar-14**
+> NOTE: This will be the last version of herokuish based on cedar-14
 
 ## [0.3.35](https://github.com/gliderlabs/herokuish/compare/v0.3.34...v0.3.35) - 2018-02-09
 

Dockerfile

@@ -3,7 +3,7 @@ ARG STACK_VERSION=20
 
 FROM golang:1.22 AS builder
 RUN mkdir /src
-ADD . /src/
+COPY . /src/
 WORKDIR /src
 
 ARG VERSION
@@ -15,7 +15,7 @@ ARG TARGETARCH
 
 ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh /tmp/setup-01.sh
 ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}-build/setup.sh /tmp/setup-02.sh
-ADD bin/setup.sh /tmp/setup.sh
+COPY bin/setup.sh /tmp/setup.sh
 RUN --mount=source=build-deps/${STACK_VERSION},target=/build  STACK_VERSION=${STACK_VERSION} TARGETARCH=${TARGETARCH} /tmp/setup.sh && \
     rm -rf /tmp/setup.sh
 
@@ -24,9 +24,9 @@ ENV DEBIAN_FRONTEND noninteractive
 LABEL com.gliderlabs.herokuish/stack=$STACK
 
 RUN apt-get update -qq \
-    && apt-get install -qq -y daemontools \
+    && apt-get install --no-install-recommends -qq -y daemontools \
     && cp /etc/ImageMagick-6/policy.xml /etc/ImageMagick-6/policy.xml.custom \
-    && apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew \
+    && apt-get  -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew \
     --allow-downgrades \
     --allow-remove-essential \
     --allow-change-held-packages \

Makefile

@@ -4,7 +4,7 @@ REPOSITORY = herokuish
 DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
-VERSION ?= 0.7.6
+VERSION ?= 0.8.0
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
@@ -159,18 +159,6 @@ ci-report:
 	ruby -v
 	rm -f ~/.gitconfig
 
-lint:
-	# SC2002: Useless cat - https://github.com/koalaman/shellcheck/wiki/SC2002
-	# SC2030: Modification of name is local - https://github.com/koalaman/shellcheck/wiki/SC2030
-	# SC2031: Modification of name is local - https://github.com/koalaman/shellcheck/wiki/SC2031
-	# SC2034: VAR appears unused - https://github.com/koalaman/shellcheck/wiki/SC2034
-	# SC2206: Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a.
-	# SC2001: See if you can use ${variable//search/replace} instead.
-	# SC2231: Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt .
-	# SC2230: which is non-standard. Use builtin 'command -v' instead.
-	@echo linting...
-	shellcheck -e SC2002,SC2030,SC2031,SC2034,SC2206,SC2001,SC2231,SC2230 -s bash include/*.bash tests/**/tests.sh
-
 release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_all.deb bin/gh-release bin/gh-release-body
 	ls -lah build build/* || true
 	chmod +x build/linux/$(NAME) build/darwin/$(NAME)