Skip to content

Commit

Permalink
Merge pull request #42 from terraform-docs/update-v0.13.0
Browse files Browse the repository at this point in the history
Update terraform-docs to v0.13.0
  • Loading branch information
khos2ow authored May 17, 2021
2 parents 112a2c5 + b2fd336 commit a0ffe6b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/templates/README.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ branch.

## Version

`{{ $version }}` (uses [terraform-docs] v0.12.1, which is supported and tested on Terraform
`{{ $version }}` (uses [terraform-docs] v0.13.0, which is supported and tested on Terraform
version 0.11+ and 0.12+ but may work for others.)

{{- if eq $version "main" }}
Expand Down
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM quay.io/terraform-docs/terraform-docs:0.12.1

# this can be removed when base image
# was upgraded to alpine:3.13 which has
# 'yq' in its repository out of the box.
RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
FROM quay.io/terraform-docs/terraform-docs:0.13.0

RUN set -x \
&& apk update \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ branch.

## Version

`v0.6.1` (uses [terraform-docs] v0.12.1, which is supported and tested on Terraform
`v0.6.1` (uses [terraform-docs] v0.13.0, which is supported and tested on Terraform
version 0.11+ and 0.12+ but may work for others.)

## Usage
Expand Down
3 changes: 1 addition & 2 deletions examples/tf12_config/.terraform-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ sections:
- inputs
sort:
enabled: true
by:
- required
by: required
settings:
indent: 3
8 changes: 7 additions & 1 deletion src/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,13 @@ update_doc() {
# shellcheck disable=SC2086
if [ -n "${CONFIG_FILE}" ] && [ "${CONFIG_FILE}" != "disabled" ]; then
echo "::debug file=entrypoint.sh,line=80 command=terraform-docs --config ${CONFIG_FILE} ${ARGS} ${working_dir}"
terraform-docs --config ${CONFIG_FILE} ${ARGS} ${working_dir} >/tmp/tf_generated
local config_file
if [ -f "${CONFIG_FILE}" ]; then
config_file="${CONFIG_FILE}"
else
config_file="${working_dir}/${CONFIG_FILE}"
fi
terraform-docs --config ${config_file} ${ARGS} ${working_dir} >/tmp/tf_generated
success=$?
else
echo "::debug file=entrypoint.sh,line=84 command=terraform-docs ${OUTPUT_FORMAT} ${ARGS} ${working_dir}"
Expand Down

0 comments on commit a0ffe6b

Please sign in to comment.