bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-22 18:15:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Dockerfiles, fix builds on ARM plaforms

Browse Source 
- Add support to ARM64, ARM/v7 and ARM/v6 devices
- Remove hardcoded "/lib/x86_64-linux-gnu" path
- Move libdl.so.* to a common location
- Format code to keep consistency between dockerfiles
This commit is contained in:
Victor R. Santos 2021-10-04 16:41:44 -03:00
parent 5fa261e91e
commit 0d47a1eee3
No known key found for this signature in database
GPG Key ID: 99B41E40D13366A1
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile.full
View File

@ -33,10 +33,12 @@ RUN cd 3proxy &&\
strip bin/TrafficPlugin.ld.so &&\ strip bin/TrafficPlugin.ld.so &&\
strip bin/PCREPlugin.ld.so &&\ strip bin/PCREPlugin.ld.so &&\
strip bin/TransparentPlugin.ld.so &&\ strip bin/TransparentPlugin.ld.so &&\
strip bin/SSLPlugin.ld.so strip bin/SSLPlugin.ld.so &&\
mkdir /usr/local/lib/3proxy &&\
cp "/lib/`gcc -dumpmachine`"/libdl.so.* /usr/local/lib/3proxy/
FROM busybox:glibc FROM busybox:glibc
COPY --from=buildenv /lib/x86_64-linux-gnu/libdl.so.* /lib/ COPY --from=buildenv /usr/local/lib/3proxy/libdl.so.* /lib/
COPY --from=buildenv 3proxy/bin/3proxy /bin/ COPY --from=buildenv 3proxy/bin/3proxy /bin/
COPY --from=buildenv 3proxy/bin/*.ld.so /usr/local/3proxy/libexec/ COPY --from=buildenv 3proxy/bin/*.ld.so /usr/local/3proxy/libexec/
RUN mkdir /usr/local/3proxy/logs &&\ RUN mkdir /usr/local/3proxy/logs &&\
@ -50,6 +52,4 @@ RUN mkdir /usr/local/3proxy/logs &&\
echo chroot /usr/local/3proxy 65535 65535 >/etc/3proxy/3proxy.cfg &&\ echo chroot /usr/local/3proxy 65535 65535 >/etc/3proxy/3proxy.cfg &&\
echo include /conf/3proxy.cfg >>/etc/3proxy/3proxy.cfg &&\ echo include /conf/3proxy.cfg >>/etc/3proxy/3proxy.cfg &&\
chmod 440 /etc/3proxy/3proxy.cfg chmod 440 /etc/3proxy/3proxy.cfg
CMD ["/bin/3proxy", "/etc/3proxy/3proxy.cfg"] CMD ["/bin/3proxy", "/etc/3proxy/3proxy.cfg"]

19
Dockerfile.minimal
View File

@ -25,18 +25,17 @@
FROM gcc AS buildenv FROM gcc AS buildenv
COPY . /3proxy COPY . 3proxy
RUN cd /3proxy &&\ RUN cd 3proxy &&\
echo "">>Makefile.Linux&&\ echo "">>Makefile.Linux &&\
echo LDFLAGS = -fPIE -O2 -fno-strict-aliasing -pthread >>Makefile.Linux&&\ echo LDFLAGS = -fPIE -O2 -fno-strict-aliasing -pthread >>Makefile.Linux &&\
echo PLUGINS = >>Makefile.Linux&&\ echo PLUGINS = >>Makefile.Linux &&\
echo LIBS = >>Makefile.Linux&&\ echo LIBS = >>Makefile.Linux &&\
echo CFLAGS = -g -fPIC -O2 -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER -DNOPLUGINS >>Makefile.Linux&&\ echo CFLAGS = -g -fPIC -O2 -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER -DNOPLUGINS >>Makefile.Linux &&\
make -f Makefile.Linux&&\ make -f Makefile.Linux &&\
strip bin/3proxy strip bin/3proxy
FROM busybox:glibc FROM busybox:glibc
COPY --from=buildenv /3proxy/bin/3proxy /bin/3proxy COPY --from=buildenv 3proxy/bin/3proxy /bin/3proxy
RUN mkdir /run && chmod 555 /run RUN mkdir /run && chmod 555 /run
CMD ["/bin/3proxy"] CMD ["/bin/3proxy"]