diff --git a/test/Dockerfile.test b/test/Dockerfile.test index 5a8e3a8d9b4e..47987e34a4a0 100644 --- a/test/Dockerfile.test +++ b/test/Dockerfile.test @@ -9,10 +9,6 @@ FROM ${DOCKER_REPOSITORY}:test-${DOCKER_OPENRESTY_SUFFIX} ENV PATH=$PATH:/kong/bin:/usr/local/openresty/bin/:/usr/local/kong/bin/:/usr/local/openresty/nginx/sbin/ ENV LUA_PATH=/kong/?.lua;/kong/?/init.lua;/root/.luarocks/share/lua/5.1/?.lua;/root/.luarocks/share/lua/5.1/?/init.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;./?.lua;/usr/local/openresty/luajit/share/luajit-2.1.0-beta3/?.lua;/usr/local/openresty/luajit/share/lua/5.1/?.lua;/usr/local/openresty/luajit/share/lua/5.1/?/init.lua ENV LUA_CPATH=/root/.luarocks/lib/lua/5.1/?.so;/usr/local/lib/lua/5.1/?.so;./?.so;/usr/local/openresty/luajit/lib/lua/5.1/?.so;/usr/local/lib/lua/5.1/loadall.so -ENV GO_VERSION="1.15.11" - -ARG KONG_GO_PLUGINSERVER_VERSION=master -ENV KONG_GO_PLUGINSERVER_VERSION $KONG_GO_PLUGINSERVER_VERSION RUN cp -R /tmp/build/* / || true RUN rm -rf /usr/local/bin/kong @@ -32,24 +28,6 @@ RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \ dpkg-reconfigure --frontend noninteractive tzdata && \ apt-get install -y postgresql -RUN curl -L https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz \ - -o /tmp/go.tar.gz && \ - cd /tmp && tar -xf go.tar.gz - -ENV GOROOT=/tmp/go -ENV PATH $GOROOT/bin:$PATH -ENV GOPATH=/tmp/gopath -ENV PATH $GOPATH/bin:$PATH - -RUN go version ; \ - mkdir /gps ; cd /gps ; \ - go mod init go-pluginserver ; \ - go get -d -v github.com/Kong/go-pluginserver@${KONG_GO_PLUGINSERVER_VERSION} ; \ - go install -ldflags="-s -w -X main.version=${KONG_GO_PLUGINSERVER_VERSION}" ... ; \ - cp /tmp/gopath/bin/go-pluginserver /usr/local/bin/ ;\ - cd ; rm -r /gps; \ - go-pluginserver --version - RUN rm -rf /kong/* || true COPY kong /kong RUN rm -rf /kong/bin/grpcurl @@ -68,10 +46,6 @@ RUN curl -L https://cpanmin.us | perl - App::cpanminus \ && cpanm --notest Test::Nginx \ && cpanm --notest local::lib -RUN go version ; \ - go get -u github.com/tsenart/vegeta ; \ - vegeta -version - RUN rm -rf /tmp/build CMD ["sh", "-c", "cat /kong/spec/fixtures/hosts >> /etc/hosts; tail -f /dev/null"]