Skip to content

Commit

Permalink
Merge pull request #18 from frankh/emissary-3.9
Browse files Browse the repository at this point in the history
feat: add emissary 3.9
  • Loading branch information
sagikazarmark authored Jan 5, 2024
2 parents 65b9197 + eac57dd commit 6b6ddb6
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ updates:
- "version-update:semver-major"
- "version-update:semver-minor"

- package-ecosystem: "docker"
directory: "/1.5/3.9"
schedule:
interval: "daily"
ignore:
- dependency-name: "*"
update-types:
- "version-update:semver-major"
- "version-update:semver-minor"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
- "3.4"
- "3.5"
- "3.6"
- "3.9"

steps:
- name: Checkout
Expand Down
34 changes: 34 additions & 0 deletions 1.5/3.9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
FROM curiefense/curieproxy-envoy:v1.5.0 as curieproxy

FROM docker.io/emissaryingress/emissary:3.9.1

RUN set -xe && \
apk add lua pcre2 geoip vectorscan && \
apk --virtual .build-deps add python3 gcc g++ make unzip lua-dev luarocks pcre2-dev geoip-dev vectorscan-dev && \
ln -s $(which luarocks-5.1) /usr/local/bin/luarocks && \
luarocks install lrexlib-pcre2 && \
luarocks install lua-cjson && \
luarocks install lua-resty-string && \
luarocks install luafilesystem && \
luarocks install luasocket && \
luarocks install redis-lua && \
luarocks install compat53 && \
luarocks install mmdblua && \
luarocks install luaipc && \
luarocks install lua-resty-injection && \
unlink /usr/local/bin/luarocks && \
apk del .build-deps && \
rm -rf /var/cache/apk/*

COPY --from=curieproxy /lua /ambassador/lua
COPY --from=curieproxy /usr/local/lib/lua/5.1/*.so /usr/local/lib/lua/5.1/

RUN ln -s /usr/lib/libhs.so.5 /usr/glibc-compat/lib/libhs.so.5
RUN ln -s /usr/lib/libhs.so.5 /usr/glibc-compat/lib/libhs.so.4

COPY --from=curieproxy --chown=ambassador:root /bootstrap-config/config /bootstrap-config/config

RUN mkdir /cf-config && chmod a+rwxt /cf-config && chown ambassador.root /cf-config

COPY entrypoint.sh /
ENTRYPOINT /entrypoint.sh
11 changes: 11 additions & 0 deletions 1.5/3.9/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

if [ ! -e /cf-config/bootstrap ]; then
cp -va /bootstrap-config /cf-config/bootstrap
fi

if [ ! -e /cf-config/current ]; then
ln -s bootstrap /cf-config/current
fi

exec bash /buildroot/ambassador/python/entrypoint.sh

0 comments on commit 6b6ddb6

Please sign in to comment.