From 83baac79c4951c537deb7d944bfab13449b69683 Mon Sep 17 00:00:00 2001
From: Pierre Smeyers <pierre.smeyers@gmail.com>
Date: Sun, 28 Jan 2024 11:48:13 +0100
Subject: [PATCH] docs: fix variables/inputs
---
README.md | 12 ++++++------
templates/gitlab-ci-docker.yml | 13 -------------
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 98300b3..a613065 100644
--- a/README.md
+++ b/README.md
@@ -706,12 +706,12 @@ then set the required configuration.
| Variable | Description | Default value |
| ------------------------ | -------------------------------------- | ----------------- |
-| `AWS_ACCESS_KEY_ID` | Default access key ID | _none_ (disabled) |
-| `AWS_SECRET_ACCESS_KEY` | Default secret access key | _none_ (disabled) |
-| `AWS_SNAPSHOT_ACCESS_KEY_ID`| Access key ID for the snapshot image _(only define to override default)_ | _none_ |
-| `AWS_SNAPSHOT_SECRET_ACCESS_KEY`| Secret access key for the snapshot image _(only define to override default)_ | _none_ |
-| `AWS_RELEASE_ACCESS_KEY_ID`| Access key ID for the release image _(only define to override default)_ | _none_ |
-| `AWS_RELEASE_SECRET_ACCESS_KEY`| Secret access key for the release image _(only define to override default)_ | _none_ |
+| :lock: `AWS_ACCESS_KEY_ID` | Default access key ID | _none_ (disabled) |
+| :lock: `AWS_SECRET_ACCESS_KEY` | Default secret access key | _none_ (disabled) |
+| :lock: `AWS_SNAPSHOT_ACCESS_KEY_ID`| Access key ID for the snapshot image _(only define to override default)_ | _none_ |
+| :lock: `AWS_SNAPSHOT_SECRET_ACCESS_KEY`| Secret access key for the snapshot image _(only define to override default)_ | _none_ |
+| :lock: `AWS_RELEASE_ACCESS_KEY_ID`| Access key ID for the release image _(only define to override default)_ | _none_ |
+| :lock: `AWS_RELEASE_SECRET_ACCESS_KEY`| Secret access key for the release image _(only define to override default)_ | _none_ |
#### Example
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index cad37ee..aa7e41b 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -124,16 +124,6 @@ spec:
_Used by the `kaniko` build only_
default: ${DOCKER_SNAPSHOT_IMAGE%:*}/cache
- lint-enabled:
- description: Enable dockerfile-lint
- type: boolean
- default: false
- lint-image:
- description: The docker image to lint your Dockerfile
- default: registry.hub.docker.com/projectatomic/dockerfile-lint:latest
- lint-args:
- description: Additional `dockerfile_lint` arguments
- default: ''
hadolint-disabled:
description: Disable Hadolint
type: boolean
@@ -235,7 +225,6 @@ workflow:
variables:
# variabilized tracking image
TBC_TRACKING_IMAGE: registry.gitlab.com/to-be-continuous/tools/tracking:master
- DOCKER_LINT_IMAGE: $[[ inputs.lint-image ]]
DOCKER_HADOLINT_IMAGE: $[[ inputs.hadolint-image ]]
DOCKER_IMAGE: $[[ inputs.image ]]
DOCKER_DIND_IMAGE: $[[ inputs.dind-image ]]
@@ -285,8 +274,6 @@ variables:
DOCKER_REGISTRY_MIRROR: $[[ inputs.registry-mirror ]]
CONTAINER_REGISTRIES_CONFIG_FILE: $[[ inputs.container-registries-config-file ]]
KANIKO_SNAPSHOT_IMAGE_CACHE: $[[ inputs.kaniko-snapshot-image-cache ]]
- DOCKER_LINT_ENABLED: $[[ inputs.lint-enabled ]]
- DOCKER_LINT_ARGS: $[[ inputs.lint-args ]]
DOCKER_HADOLINT_DISABLED: $[[ inputs.hadolint-disabled ]]
DOCKER_HADOLINT_ARGS: $[[ inputs.hadolint-args ]]
DOCKER_HEALTHCHECK_DISABLED: $[[ inputs.healthcheck-disabled ]]
--
GitLab