Merge pull request #236 from ivanilves/release-v1-2-22

Release v1.2.22 (issue-234 + general security)

.circleci/config.yml

@@ -3,10 +3,11 @@ jobs:
  build_test_release:
  working_directory: /go/src/github.com/ivanilves/lstags
  docker:
- - image: circleci/golang:1.13
+ - image: circleci/golang:1.17
  environment:
  DOCKERHUB_USERNAME: ivanilves
  DOCKERHUB_PRIVATE_REPO: ivanilves/private-dummy
+ CONCURRENT_REQUESTS: "4"
  steps:
  - setup_remote_docker
  - run:

Makefile

@@ -40,20 +40,12 @@ whitebox-integration-test:
  | xargs -I {} dirname {} \
  | xargs -I {} bash -c "pushd {}; go test -v -cover || exit 1; popd"
 
-coverage: PROJECT:=github.com/ivanilves/lstags
 coverage: SERVICE:=ci
 coverage:
- @overalls -project=${PROJECT} -covermode=count \
+ @overalls -project=${PWD} -covermode=count \
  && if [[ -n "${COVERALLS_REPO_TOKEN}" ]]; then goveralls -coverprofile=overalls.coverprofile -repotoken ${COVERALLS_REPO_TOKEN} -service=${SERVICE}; fi
 
-blackbox-integration-test: shell-test-alpine shell-test-wrong-image \
- shell-test-docker-socket shell-test-docker-tcp shell-test-pullpush
-
-shell-test-alpine:
- ./lstags alpine | egrep "\salpine:latest"
-
-shell-test-wrong-image:
- ./lstags nobody/nothing &>/dev/null && exit 1 || true
+blackbox-integration-test: shell-test-docker-socket shell-test-docker-tcp shell-test-pullpush
 
 shell-test-docker-socket:
  unset DOCKER_HOST && ./lstags alpine~/latest/
@@ -97,7 +89,7 @@ lint: fail-on-errors
 vet: ERRORS=$(shell go vet)
 vet: fail-on-errors
 
-semantic: REGEX:="^(feat|fix|docs|style|refactor|test|chore|localize)(\([a-zA-Z0-9\/_-]+\))?: [a-zA-Z]"
+semantic: REGEX:="^(feat|fix|docs|style|refactor|test|chore|localize|security)(\([a-zA-Z0-9\/_-]+\))?: [a-zA-Z]"
 semantic:
  @if [[ -n "${RANGE}" ]]; then \
  git log --pretty="format:%s" ${RANGE} | egrep -v "(Merge pull request|Merge branch)" \

scripts/github-upload-assets.sh

@@ -23,7 +23,7 @@ ID=$(curl -s -H "Authorization: Token ${GITHUB_TOKEN}" "${API_URL}/tags/${TAG}"
 
 pushd "${ASSETS_PATH}"
  for DIR in $(find -mindepth 1 -maxdepth 1 -type d); do
- tar -C "${DIR}" -zc . -f "${DIR}-$(cat ../release/NAME).tar.gz"
+ tar -C "${DIR}" -zc lstags -f "${DIR}-$(cat ../release/NAME).tar.gz"
  done
 
  for FILE in $(find -mindepth 1 -maxdepth 1 -type f); do