diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 32bab57f..00000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Build & Test -on: [push, pull_request] - -jobs: - test: - name: Build & Test - runs-on: ubuntu-20.04 - - strategy: - matrix: - image: [alpine, ubuntu, rhel] - - env: - BASE: ${{ matrix.image }} - KONG_DOCKER_TAG: kong-${{ matrix.image }} - - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Build - run: | - make build - - name: Test - shell: 'script -q -e -c "bash {0}"' - run: | - make test - - name: Push RHEL - if: ${{ github.event_name == 'create' && github.event.ref_type == 'tag' }} - run: | - make release-rhel diff --git a/.github/workflows/version2_test.yml b/.github/workflows/version2_test.yml index fc8907c9..cddbff35 100644 --- a/.github/workflows/version2_test.yml +++ b/.github/workflows/version2_test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - package: [apk, deb, rpm] + package: [rpm] env: BASE: ${{ matrix.package }} diff --git a/Dockerfile.rpm b/Dockerfile.rpm index a4ce772f..5999603b 100644 --- a/Dockerfile.rpm +++ b/Dockerfile.rpm @@ -22,7 +22,15 @@ RUN set -ex; \ curl -fL $DOWNLOAD_URL -o /tmp/kong.rpm \ && echo "${KONG_SHA256} /tmp/kong.rpm" | sha256sum -c -; \ fi \ - && yum install -y /tmp/kong.rpm \ + && yum install -y /tmp/kong.rpm wget gcc make ncurses-devel \ + && wget https://ftp.gnu.org/gnu/readline/readline-8.2-rc4.tar.gz \ + && tar zxvf readline-8.2-rc4.tar.gz && cd readline-8.2-rc4 && ./configure && make && make install && cd - \ + && export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH \ + && wget https://www.lua.org/ftp/lua-5.1.5.tar.gz && tar -zxvf lua-5.1.5.tar.gz \ + && cd lua-5.1.5 && make linux && make linux install && cd - \ + && wget https://luarocks.org/releases/luarocks-3.8.0.tar.gz && tar zxpf luarocks-3.8.0.tar.gz \ + && cd luarocks-3.8.0 && ./configure && make && make install && cd -\ + && export PATH=$PATH:/usr/local/bin/luarocks \ && rm /tmp/kong.rpm \ && chown kong:0 /usr/local/bin/kong \ && chown -R kong:0 "$KONG_PREFIX" \