Skip to content

Commit

Permalink
Remove squid hack
Browse files Browse the repository at this point in the history
  • Loading branch information
taoky committed Jul 2, 2024
1 parent 444f358 commit 33465e8
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 46 deletions.
1 change: 0 additions & 1 deletion .docker/rootfs/etc/supervisor.d/supervisord.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ nodaemon = true

[program:squid]
command=/usr/sbin/squid -N -f /etc/squid/squid.conf
environment=LD_PRELOAD="/usr/lib/squid-preload.so"
redirect_stderr=true
stdout_logfile=/var/log/supervisor/squid.info.log
stderr_logfile=/var/log/supervisor/squid.error.log
Expand Down
6 changes: 0 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
FROM alpine:3.18 AS builder
COPY ./squid-preload.c /tmp/squid-preload.c
RUN apk add --no-cache gcc musl-dev && \
gcc -fPIC -O3 -shared -Wl,-export-dynamic -o /tmp/squid-preload.so /tmp/squid-preload.c -lc

FROM smartentry/alpine:3.18

MAINTAINER Yifan Gao <[email protected]>

COPY .docker $ASSETS_DIR
COPY --from=builder /tmp/squid-preload.so $ASSETS_DIR/rootfs/usr/lib/squid-preload.so

RUN smartentry.sh build
39 changes: 0 additions & 39 deletions squid-preload.c

This file was deleted.

0 comments on commit 33465e8

Please sign in to comment.