Skip to content

Commit

Permalink
Update git njk's build dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Levi Pesin <[email protected]>
  • Loading branch information
LeviPesin committed Nov 13, 2024
1 parent e4989e3 commit 745a8b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Feel free to [open an issue](https://github.com/warriors-life/yokohama-proxy/iss

## TODO
- [ ] TODOs in configuration files.
- [ ] Tests should include catastrophic backtracking tests for regexps (e.g. regexps for file paths).
- [ ] Convert configuration to config maps?
- [ ] Possibly use NGINX Ingress controller instead of NGINX container?
- [ ] Consider splitting into mulitple NGINX instances (one managing load balancing and rate limiting, others managing more complex stuff)?
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN rm -rf /etc/nginx && mkdir /etc/nginx && \
# Remove unneeded packages
apk del --no-network libintl tzdata && rm -f /usr/local/bin/envsubst && \
# Build njk
tempDir="$(mktemp -d)" && chown nobody:nobody "$tempDir" && apk add --no-cache --virtual .build-deps gcc=12.2.1_git20220924-r10 make=4.4.1-r1 cmake=3.26.5-r0 libc-dev=0.7.2-r5 git=2.40.1-r0 && su nobody -s /bin/sh -c "export HOME=\"$tempDir\" && cd \"$tempDir\" && git clone --recursive --depth 1 --branch master https://github.com/saghul/njk && cd njk && make" && apk del --no-network .build-deps && mv "$tempDir/njk/build/njk" /usr/local/bin/njk && rm -rf "$tempDir"
tempDir="$(mktemp -d)" && chown nobody:nobody "$tempDir" && apk add --no-cache --virtual .build-deps gcc=12.2.1_git20220924-r10 make=4.4.1-r1 cmake=3.26.5-r0 libc-dev=0.7.2-r5 git=2.40.3-r0 && su nobody -s /bin/sh -c "export HOME=\"$tempDir\" && cd \"$tempDir\" && git clone --recursive --depth 1 --branch master https://github.com/saghul/njk && cd njk && make" && apk del --no-network .build-deps && mv "$tempDir/njk/build/njk" /usr/local/bin/njk && rm -rf "$tempDir"

COPY --link 20-njk-on-templates.sh /docker-entrypoint.d/

Expand Down

0 comments on commit 745a8b1

Please sign in to comment.