gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

print the commit that the interop docker image was build with

Browse Source
This commit is contained in:
Marten Seemann
2020-04-09 12:11:30 +07:00
parent 10137b0c9b
commit 16d84df4ec
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
interop/Dockerfile
View File

@@ -18,6 +18,7 @@ RUN git clone https://github.com/lucas-clemente/quic-go && \
WORKDIR /quic-go WORKDIR /quic-go
RUN git rev-parse HEAD > commit.txt
RUN go build -o server interop/server/main.go && \ RUN go build -o server interop/server/main.go && \
go build -o client interop/client/main.go go build -o client interop/client/main.go
@@ -27,7 +28,7 @@ FROM martenseemann/quic-network-simulator-endpoint:latest
WORKDIR /quic-go WORKDIR /quic-go
COPY --from=builder /quic-go/internal/testdata/cert.pem /quic-go/internal/testdata/priv.key internal/testdata/ COPY --from=builder /quic-go/internal/testdata/cert.pem /quic-go/internal/testdata/priv.key internal/testdata/
COPY --from=builder /quic-go/server /quic-go/client ./ COPY --from=builder /quic-go/commit.txt /quic-go/server /quic-go/client ./
COPY run_endpoint.sh . COPY run_endpoint.sh .
RUN chmod +x run_endpoint.sh RUN chmod +x run_endpoint.sh

2
interop/run_endpoint.sh
View File

@@ -4,6 +4,8 @@ set -e
# Set up the routing needed for the simulation. # Set up the routing needed for the simulation.
/setup.sh /setup.sh
echo "Using commit:" `cat commit.txt`
if [ "$ROLE" == "client" ]; then if [ "$ROLE" == "client" ]; then
# Wait for the simulator to start up. # Wait for the simulator to start up.
/wait-for-it.sh sim:57832 -s -t 10 /wait-for-it.sh sim:57832 -s -t 10