Skip to content

Commit 09d8cbd

Browse files
cytopiacytopia
committed
Fix terraform-docs directory workings
1 parent 6ecd8ee commit 09d8cbd

File tree

4 files changed

+26
-27
lines changed

4 files changed

+26
-27
lines changed

‎Dockerfile-0.11

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ COPY --from=builder /usr/local/bin/terraform-docs /usr/local/bin/terraform-docs
6666
COPY ./data/docker-entrypoint-0.11.sh /docker-entrypoint.sh
6767
COPY ./data/terraform-docs.awk /terraform-docs.awk
6868

69-
ENV WORKDIR /data
7069
WORKDIR /data
7170

7271
CMD ["terraform-docs", "--version"]

‎Dockerfile-0.12

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ LABEL \
5151
COPY --from=builder /usr/local/bin/terraform-docs /usr/local/bin/terraform-docs
5252
COPY ./data/docker-entrypoint-0.12.sh /docker-entrypoint.sh
5353

54-
ENV WORKDIR /data
5554
WORKDIR /data
5655

5756
CMD ["terraform-docs", "--version"]

‎data/docker-entrypoint-0.11.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,41 +79,41 @@ if [ "${#}" -ge "1" ]; then
7979

8080

8181
# Check if file exists
82-
if [ ! -f "${WORKDIR}/${MY_FILE}" ]; then
83-
>&2 echo "Error, ${MY_FILE} not found in: ${WORKDIR}/${MY_FILE}"
82+
if [ ! -f "${MY_FILE}" ]; then
83+
>&2 echo "Error, File not found in: ${MY_FILE}"
8484
exit 1
8585
fi
8686
# Check if starting delimiter exists in file
87-
if ! grep -Fq "${DELIM_START}" "${WORKDIR}/${MY_FILE}"; then
87+
if ! grep -Fq "${DELIM_START}" "${MY_FILE}"; then
8888
>&2 echo "Error, Starting delimiter not found ${MY_FILE}: '${DELIM_START}'"
8989
exit 1
9090
fi
9191
# Check if closint delimiter exists in file
92-
if ! grep -Fq "${DELIM_CLOSE}" "${WORKDIR}/${MY_FILE}"; then
92+
if ! grep -Fq "${DELIM_CLOSE}" "${MY_FILE}"; then
9393
>&2 echo "Error, Closing delimiter not found ${MY_FILE}: '${DELIM_CLOSE}'"
9494
exit 1
9595
fi
9696

9797
# Get owner and permissions of current file
98-
UID="$(stat -c %u "${WORKDIR}/${MY_FILE}")"
99-
GID="$(stat -c %g "${WORKDIR}/${MY_FILE}")"
100-
PERM="$(stat -c %a "${WORKDIR}/${MY_FILE}")"
98+
UID="$(stat -c %u "${MY_FILE}")"
99+
GID="$(stat -c %g "${MY_FILE}")"
100+
PERM="$(stat -c %a "${MY_FILE}")"
101101

102102
# Terraform < 0.12
103103
if [ "${1}" = "terraform-docs-replace" ]; then
104104
# Remove first argument "replace"
105105
shift;
106106
# Get terraform-docs output
107-
>&2 echo "terraform-docs ${*} ${WORKDIR}"
108-
DOCS="$(terraform-docs "${@}" "${WORKDIR}")"
107+
>&2 echo "terraform-docs ${*} $(dirname "${MY_FILE}")"
108+
DOCS="$(terraform-docs "${@}" "$(dirname "${MY_FILE}")")"
109109
# Terraform >= 0.12
110110
else
111111
# Remove first argument "replace"
112112
shift;
113113
mkdir -p /tmp-012
114114
awk -f /terraform-docs.awk -- *.tf > "/tmp-012/tmp.tf"
115115
# Get terraform-docs output
116-
>&2 echo "terraform-docs-012 ${*} ${WORKDIR}"
116+
>&2 echo "terraform-docs-012 ${*} $(dirname "${MY_FILE}")"
117117
if ! DOCS="$(terraform-docs "${@}" "/tmp-012")"; then
118118
cat -n "/tmp-012/tmp.tf" >&2
119119
exit 1
@@ -122,16 +122,16 @@ if [ "${#}" -ge "1" ]; then
122122

123123
# Create temporary README.md
124124
mkdir -p /tmp
125-
grep -B 100000000 -F "${DELIM_START}" "${WORKDIR}/${MY_FILE}" > /tmp/README.md
125+
grep -B 100000000 -F "${DELIM_START}" "${MY_FILE}" > /tmp/README.md
126126
printf "%s\\n\\n" "${DOCS}" >> /tmp/README.md
127-
grep -A 100000000 -F "${DELIM_CLOSE}" "${WORKDIR}/${MY_FILE}" >> /tmp/README.md
127+
grep -A 100000000 -F "${DELIM_CLOSE}" "${MY_FILE}" >> /tmp/README.md
128128

129129
# Adjust permissions of temporary file
130130
chown "${UID}:${GID}" /tmp/README.md
131131
chmod "${PERM}" /tmp/README.md
132132

133133
# Overwrite existing file
134-
mv -f /tmp/README.md "${WORKDIR}/${MY_FILE}"
134+
mv -f /tmp/README.md "${MY_FILE}"
135135
exit 0
136136

137137
###

‎data/docker-entrypoint-0.12.sh

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,44 +81,44 @@ if [ "${#}" -ge "1" ]; then
8181

8282

8383
# Check if file exists
84-
if [ ! -f "${WORKDIR}/${MY_FILE}" ]; then
85-
>&2 echo "Error, ${MY_FILE} not found in: ${WORKDIR}/${MY_FILE}"
84+
if [ ! -f "${MY_FILE}" ]; then
85+
>&2 echo "Error, File not found in: ${MY_FILE}"
8686
exit 1
8787
fi
8888
# Check if starting delimiter exists in file
89-
if ! grep -Fq "${DELIM_START}" "${WORKDIR}/${MY_FILE}"; then
89+
if ! grep -Fq "${DELIM_START}" "${MY_FILE}"; then
9090
>&2 echo "Error, Starting delimiter not found ${MY_FILE}: '${DELIM_START}'"
9191
exit 1
9292
fi
9393
# Check if closint delimiter exists in file
94-
if ! grep -Fq "${DELIM_CLOSE}" "${WORKDIR}/${MY_FILE}"; then
94+
if ! grep -Fq "${DELIM_CLOSE}" "${MY_FILE}"; then
9595
>&2 echo "Error, Closing delimiter not found ${MY_FILE}: '${DELIM_CLOSE}'"
9696
exit 1
9797
fi
9898

9999
# Get owner and permissions of current file
100-
UID="$(stat -c %u "${WORKDIR}/${MY_FILE}")"
101-
GID="$(stat -c %g "${WORKDIR}/${MY_FILE}")"
102-
PERM="$(stat -c %a "${WORKDIR}/${MY_FILE}")"
100+
UID="$(stat -c %u "${MY_FILE}")"
101+
GID="$(stat -c %g "${MY_FILE}")"
102+
PERM="$(stat -c %a "${MY_FILE}")"
103103

104104
# Remove first argument "replace"
105105
shift;
106106
# Get terraform-docs output
107-
>&2 echo "terraform-docs ${*} ${WORKDIR}"
108-
DOCS="$(terraform-docs "${@}" "${WORKDIR}")"
107+
>&2 echo "terraform-docs ${*} $(dirname "${MY_FILE}")"
108+
DOCS="$(terraform-docs "${@}" "$(dirname "${MY_FILE}")")"
109109

110110
# Create temporary README.md
111111
mkdir -p /tmp
112-
grep -B 100000000 -F "${DELIM_START}" "${WORKDIR}/${MY_FILE}" > /tmp/README.md
112+
grep -B 100000000 -F "${DELIM_START}" "${MY_FILE}" > /tmp/README.md
113113
printf "%s\\n\\n" "${DOCS}" >> /tmp/README.md
114-
grep -A 100000000 -F "${DELIM_CLOSE}" "${WORKDIR}/${MY_FILE}" >> /tmp/README.md
114+
grep -A 100000000 -F "${DELIM_CLOSE}" "${MY_FILE}" >> /tmp/README.md
115115

116116
# Adjust permissions of temporary file
117117
chown "${UID}:${GID}" /tmp/README.md
118118
chmod "${PERM}" /tmp/README.md
119119

120120
# Overwrite existing file
121-
mv -f /tmp/README.md "${WORKDIR}/${MY_FILE}"
121+
mv -f /tmp/README.md "${MY_FILE}"
122122
exit 0
123123

124124
###
@@ -128,6 +128,7 @@ if [ "${#}" -ge "1" ]; then
128128

129129
# Remove first argument "replace"
130130
shift
131+
>&2 echo "terraform-docs ${*}"
131132
terraform-docs "${@}"
132133

133134
###

0 commit comments

Comments
 (0)