Skip to content

Commit 6384381

Browse files
committed
upgrade libjwt, copy out all binaries
1 parent 820b1a4 commit 6384381

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
.idea
22
ngx_http_auth_jwt_module.so
3+
libjwt.so.0.6.0
4+
libjwt.la
5+
libjwt.a
6+
libjansson.so.4.13.0
7+
libjwt.so.0.7.0

Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ LABEL maintainer="TeslaGov" email="[email protected]"
55
ARG NGINX_VERSION=1.16.1
66

77
ENV LD_LIBRARY_PATH=/usr/local/lib
8+
# ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/share/pkgconfig
89

910
RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
1011
yum -y update && \
@@ -46,15 +47,17 @@ RUN wget https://github.com/akheron/jansson/archive/v$JANSSON_VERSION.zip && \
4647
make check && \
4748
make install
4849

50+
ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/share/pkgconfig
51+
4952
# build libjwt
50-
ARG LIBJWT_VERSION=1.11.0
53+
ARG LIBJWT_VERSION=1.12.0
5154
RUN wget https://github.com/benmcollins/libjwt/archive/v$LIBJWT_VERSION.zip && \
5255
unzip v$LIBJWT_VERSION.zip && \
5356
rm v$LIBJWT_VERSION.zip && \
5457
ln -sf libjwt-$LIBJWT_VERSION libjwt && \
5558
cd /root/dl/libjwt && \
5659
autoreconf -i && \
57-
./configure JANSSON_CFLAGS=/usr/local/include JANSSON_LIBS=/usr/local/lib && \
60+
./configure && \
5861
make all && \
5962
make install
6063

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ stop-nginx:
3939
start-nginx:
4040
docker run --rm --name "$(DOCKER_IMAGE_NAME)-cont" -d -p 8000:8000 $(DOCKER_ORG_NAME)/$(DOCKER_IMAGE_NAME)
4141
docker cp $(DOCKER_IMAGE_NAME)-cont:/usr/lib64/nginx/modules/ngx_http_auth_jwt_module.so .
42+
docker cp $(DOCKER_IMAGE_NAME)-cont:/usr/local/lib/libjansson.so.4.13.0 .
43+
docker cp $(DOCKER_IMAGE_NAME)-cont:/usr/local/lib/libjwt.a .
44+
docker cp $(DOCKER_IMAGE_NAME)-cont:/usr/local/lib/libjwt.la .
45+
docker cp $(DOCKER_IMAGE_NAME)-cont:/usr/local/lib/libjwt.so.0.7.0 .
4246

4347
.PHONY: build-test-runner
4448
build-test-runner:
@@ -50,4 +54,4 @@ rebuild-test-runner:
5054

5155
.PHONY: test
5256
test:
53-
docker run --rm $(DOCKER_ORG_NAME)/jwt-nginx-test-runner
57+
docker run --rm $(DOCKER_ORG_NAME)/jwt-nginx-test-runner

0 commit comments

Comments
 (0)