Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release/2.0.4 #361

Merged
merged 12 commits into from
May 6, 2020
Merged

release/2.0.4 #361

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fd85217
fix(builds) adjust our Dockerfiles so they are conformant with offici…
hutchic Apr 23, 2020
1afe319
chore(release) bump to 2.0.4
hutchic Apr 24, 2020
b177970
chore(build) dont COPY based on a ARG for the official docker image b…
hutchic Apr 27, 2020
9b64801
fix(commands) squash some of the RUN commands together
hutchic Apr 28, 2020
f61b66a
chore(combine) combine some RUN commands
hutchic Apr 29, 2020
1d3796a
fix(curl) add -f to the curl command so they fail if the asset isn't …
hutchic Apr 30, 2020
c83e140
Merge branch 'master' into release/2.0.4
hutchic May 6, 2020
6d534e8
chore(automation) update the update.sh script to be compatible with t…
hutchic May 6, 2020
3d8861c
chore(redhat) update redhat to be more easily updated automatically
hutchic May 6, 2020
d854e81
fix(update) adjust so the update script is ubuntu compatible
hutchic May 6, 2020
d133c2e
chore(readme) we dont require the previous version
hutchic May 6, 2020
8b623e9
fix(local) adjust buildling with local asset
hutchic May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore(combine) combine some RUN commands
  • Loading branch information
@hutchic
hutchic committed Apr 29, 2020
commit f61b66a9e93e348ccf98447e3ef1ebc3d40d76ff
15 changes: 7 additions & 8 deletions alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ RUN set -ex; \
tar -C /kong -xzf /tmp/kong.tar.gz && \
mv /kong/usr/local/* /usr/local && \
mv /kong/etc/* /etc && \
rm -rf /kong

RUN apk add --no-cache libgcc openssl pcre perl tzdata libcap zip bash \
&& adduser -S kong \
&& mkdir -p "/usr/local/kong" \
&& chown -R kong:0 /usr/local/kong \
&& chown kong:0 /usr/local/bin/kong \
&& chmod -R g=u /usr/local/kong
rm -rf /kong && \
apk add --no-cache libgcc openssl pcre perl tzdata libcap zip bash && \
adduser -S kong && \
mkdir -p "/usr/local/kong" && \
chown -R kong:0 /usr/local/kong && \
chown kong:0 /usr/local/bin/kong && \
chmod -R g=u /usr/local/kong

COPY docker-entrypoint.sh /docker-entrypoint.sh

Expand Down
5 changes: 2 additions & 3 deletions centos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ RUN set -ex; \
fi; \
yum install -y -q unzip shadow-utils \
&& yum clean all -q \
&& rm -fr /var/cache/yum/* /tmp/yum_save*.yumtx /root/.pki

RUN useradd kong \
&& rm -fr /var/cache/yum/* /tmp/yum_save*.yumtx /root/.pki \
&& useradd kong \
&& mkdir -p "/usr/local/kong" \
&& yum install -y /tmp/kong.rpm \
&& yum clean all \
Expand Down
5 changes: 2 additions & 3 deletions rhel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ RUN set -ex; \
fi; \
yum install -y -q unzip shadow-utils \
&& yum clean all -q \
&& rm -fr /var/cache/yum/* /tmp/yum_save*.yumtx /root/.pki

RUN useradd kong \
&& rm -fr /var/cache/yum/* /tmp/yum_save*.yumtx /root/.pki \
&& useradd kong \
&& mkdir -p "/usr/local/kong" \
&& yum install -y /tmp/kong.rpm \
&& yum clean all \
Expand Down
5 changes: 2 additions & 3 deletions ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ RUN set -ex; \
&& apt-get install -y --no-install-recommends perl unzip \
&& rm -rf /var/lib/apt/lists/* \
&& dpkg -i /tmp/kong.deb \
&& rm -rf /tmp/kong.deb

RUN useradd -ms /bin/bash kong \
&& rm -rf /tmp/kong.deb \
&& useradd -ms /bin/bash kong \
&& mkdir -p "/usr/local/kong" \
&& chown -R kong:0 /usr/local/kong \
&& chown kong:0 /usr/local/bin/kong \
Expand Down