Commit 2c68d764 authored by Dave Cooper's avatar Dave Cooper
Browse files

smooth out the testing files.

parent b7786839
Loading
Loading
Loading
Loading
Loading
+16 −7
Original line number Diff line number Diff line
@@ -18,17 +18,26 @@ RUN apt-get -y update && apt-get -y upgrade && apt-get -y autoremove && \
    tar xz --strip-components=1 -C /usr/local/bin docker/docker && \
    chmod +x /usr/local/bin/docker	  


COPY --chown=$CONT_USER:$CONT_USER gendl/. /opt/gendl/
COPY --chown=$CONT_USER:$CONT_USER gendl-src/docker/build-build/run-gendl-services \
                                   gendl-src/docker/build-build/run-pipeline-tests.sh /opt/gendl/
COPY --chown=$CONT_USER:$CONT_USER gendl-src/docker/build-build/start-services.lisp \
                                   gendl-src/docker/build-build/pipeline-tests.lisp /opt/gendl/gdl/
COPY --chown=$CONT_USER:$CONT_USER gendl-src/docker/build-build/etc/rc.local /etc/
COPY --chown=$CONT_USER:$CONT_USER ./gendl-src/regression/ /opt/gendl-regression/

COPY --chown=$CONT_USER:$CONT_USER ./gendl-src/ /src/gendl/

USER $CONT_USER

RUN cp /src/gendl/docker/build-build/run-gendl-services \
       /src/gendl/docker/build-build/run-pipeline-tests.sh \
       /src/gendl/docker/build-build/start-services.lisp \
       /src/gendl/docker/build-build/pipeline-tests.lisp \
       /opt/gendl/ && \
    chmod +x /opt/gendl/run-pipeline-tests.sh && \
    chmod +x /opt/gendl/run-gendl-services && \
    cp -ar /src/regression/ /opt/gendl-regression/

USER root

RUN cp /src/gendl/docker/build-build/etc/rc.local /etc/

RUN chown $CONT_USER /opt
RUN chmod +x /opt/gendl/run-pipeline-tests.sh 

USER $CONT_USER
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ else
    gdlexe="gdl-sbcl"
fi
    
exec su - gendl-user -c "cd ${GENDL_DIR}; HTTP_PORT=${HTTP_PORT} HTTPS_PORT=${HTTPS_PORT} SWANK_PORT=${SWANK_PORT} TELNET_PORT=${TELNET_PORT} HTTP_HOST_PORT=${HTTP_HOST_PORT} HTTPS_HOST_PORT=${HTTPS_HOST_PORT} SWANK_HOST_PORT=${SWANK_HOST_PORT} TELNET_HOST_PORT=${TELNET_HOST_PORT} START_SWANK=${START_SWANK} START_HTTP=${START_HTTP} START_HTTPS=${START_HTTPS} START_TELNET=${START_TELNET} ./gdl/program/${gdlexe} --load ./gdl/start-services.lisp"
exec su - gendl-user -c "cd ${GENDL_DIR}; HTTP_PORT=${HTTP_PORT} HTTPS_PORT=${HTTPS_PORT} SWANK_PORT=${SWANK_PORT} TELNET_PORT=${TELNET_PORT} HTTP_HOST_PORT=${HTTP_HOST_PORT} HTTPS_HOST_PORT=${HTTPS_HOST_PORT} SWANK_HOST_PORT=${SWANK_HOST_PORT} TELNET_HOST_PORT=${TELNET_HOST_PORT} START_SWANK=${START_SWANK} START_HTTP=${START_HTTP} START_HTTPS=${START_HTTPS} START_TELNET=${START_TELNET} ./gdl/program/${gdlexe} --load ./start-services.lisp"



+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
set -e

# Path to pipeline tests
PIPELINE_TESTS_LISP="/opt/gendl/gdl/pipeline-tests.lisp"
PIPELINE_TESTS_LISP="/opt/gendl/pipeline-tests.lisp"

echo "Running pipeline tests (timestamp: $(date '+%Y-%m-%d %H:%M:%S'))..."