Skip to content

Commit

Permalink
Add VOLUME for temporary paths (#124)
Browse files Browse the repository at this point in the history
  • Loading branch information
neomantra committed Oct 4, 2019
1 parent 31a0664 commit b978e94
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 13 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Changelog
=========

## 1.15.8.2-3 (untagged)
## 1.15.8.2-3

* Fix broken `alpine` logging
* Add `VOLUME` for temporary paths (#124)

## 1.15.8.2-2 (broken, do not use)

Expand Down
7 changes: 3 additions & 4 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@ LABEL resty_add_package_rundeps="${RESTY_ADD_PACKAGE_RUNDEPS}"
LABEL resty_eval_pre_configure="${RESTY_EVAL_PRE_CONFIGURE}"
LABEL resty_eval_post_make="${RESTY_EVAL_POST_MAKE}"

# 1) Install apk dependencies
# 2) Download and untar OpenSSL, PCRE, and OpenResty
# 3) Build OpenResty
# 4) Cleanup
# Volume for temporary files
VOLUME ["/var/run/openresty"]


RUN apk add --no-cache --virtual .build-deps \
build-base \
Expand Down
7 changes: 3 additions & 4 deletions bionic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,9 @@ LABEL resty_add_package_rundeps="${RESTY_ADD_PACKAGE_RUNDEPS}"
LABEL resty_eval_pre_configure="${RESTY_EVAL_PRE_CONFIGURE}"
LABEL resty_eval_post_make="${RESTY_EVAL_POST_MAKE}"

# 1) Install apt dependencies
# 2) Download and untar OpenSSL, PCRE, and OpenResty
# 3) Build OpenResty
# 4) Cleanup
# Volume for temporary files
VOLUME ["/var/run/openresty"]


RUN DEBIAN_FRONTEND=noninteractive apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand Down
3 changes: 3 additions & 0 deletions centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ LABEL resty_rpm_flavor="${RESTY_RPM_FLAVOR}"
LABEL resty_rpm_version="${RESTY_RPM_VERSION}"
LABEL resty_rpm_arch="${RESTY_RPM_ARCH}"

# Volume for temporary files
VOLUME ["/var/run/openresty"]

RUN yum-config-manager --add-repo https://openresty.org/package/${RESTY_IMAGE_BASE}/openresty.repo \
&& yum install -y \
gettext \
Expand Down
3 changes: 3 additions & 0 deletions stretch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ LABEL resty_image_tag="${RESTY_IMAGE_TAG}"
LABEL resty_deb_flavor="${RESTY_DEB_FLAVOR}"
LABEL resty_deb_version="${RESTY_DEB_VERSION}"

# Volume for temporary files
VOLUME ["/var/run/openresty"]

RUN DEBIAN_FRONTEND=noninteractive apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
ca-certificates \
Expand Down
3 changes: 3 additions & 0 deletions windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ LABEL resty_image_base="${RESTY_IMAGE_BASE}"
LABEL resty_image_tag="${RESTY_IMAGE_TAG}"
LABEL resty_version="${RESTY_VERSION}"

# Volume for temporary files
VOLUME ["/var/run/openresty"]

WORKDIR C:/openresty
RUN setx /M PATH "%PATH%;C:\Strawberry\perl\bin;C:\openresty"

Expand Down
6 changes: 2 additions & 4 deletions xenial/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,9 @@ LABEL resty_add_package_rundeps="${RESTY_ADD_PACKAGE_RUNDEPS}"
LABEL resty_eval_pre_configure="${RESTY_EVAL_PRE_CONFIGURE}"
LABEL resty_eval_post_make="${RESTY_EVAL_POST_MAKE}"

# Volume for temporary files
VOLUME ["/var/run/openresty"]

# 1) Install apt dependencies
# 2) Download and untar OpenSSL, PCRE, and OpenResty
# 3) Build OpenResty
# 4) Cleanup

RUN DEBIAN_FRONTEND=noninteractive apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand Down

0 comments on commit b978e94

Please sign in to comment.