diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml
index 8aed27c58..ca3c98333 100644
--- a/.github/workflows/build-push.yaml
+++ b/.github/workflows/build-push.yaml
@@ -1,8 +1,7 @@
-name: Parseable Docker build and push
+name: Integration tests
on:
- push:
- branches: ['main']
+ pull_request:
paths-ignore:
- 'docs/**'
- 'helm/**'
@@ -15,17 +14,17 @@ env:
jobs:
- # docker-compose-test:
- # name: Docker Compose integration tests
- # runs-on: ubuntu-latest
- # steps:
- # - name: Checkout
- # uses: actions/checkout@v3
- # - name: Start compose
- # run: docker-compose -f "docker-compose.yaml" up --build
- # - name: Stop compose
- # if: always()
- # run: docker-compose -f "docker-compose.yaml" down
+ docker-compose-test:
+ name: Docker Compose integration tests
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ - name: Start compose
+ run: docker-compose -f "docker-compose.yaml" up --build
+ - name: Stop compose
+ if: always()
+ run: docker-compose -f "docker-compose.yaml" down
# docker-build:
# name: Docker build
@@ -36,30 +35,30 @@ jobs:
# - name: Build Docker image
# run: docker build .
- build-and-push-image:
- name: Build and push Docker image to GitHub Container Registry
- runs-on: ubuntu-latest
- permissions:
- contents: read
- packages: write
- steps:
- - name: Checkout repository
- uses: actions/checkout@v3
- - name: Log in to the Container registry
- uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
- with:
- registry: ${{ env.REGISTRY }}
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Extract metadata (tags, labels) for Docker
- id: meta
- uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
- with:
- images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- - name: Build and push Docker image
- uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
- with:
- context: .
- push: true
- tags: ${{ steps.meta.outputs.tags }}
- labels: ${{ steps.meta.outputs.labels }}
+ # build-and-push-image:
+ # name: Build and push Docker image to GitHub Container Registry
+ # runs-on: ubuntu-latest
+ # permissions:
+ # contents: read
+ # packages: write
+ # steps:
+ # - name: Checkout repository
+ # uses: actions/checkout@v3
+ # - name: Log in to the Container registry
+ # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+ # with:
+ # registry: ${{ env.REGISTRY }}
+ # username: ${{ github.actor }}
+ # password: ${{ secrets.GITHUB_TOKEN }}
+ # - name: Extract metadata (tags, labels) for Docker
+ # id: meta
+ # uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+ # with:
+ # images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ # - name: Build and push Docker image
+ # uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+ # with:
+ # context: .
+ # push: true
+ # tags: ${{ steps.meta.outputs.tags }}
+ # labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 73c2fa254..4f2578cf5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,4 +1,4 @@
-name: Parseable CI Workflow
+name: Linter
on:
pull_request:
diff --git a/Dockerfile b/Dockerfile
index 4576ca06a..0df5b133f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-
-FROM rust:slim-bullseye as builder
+# build stage
+FROM rust:1.67.0-bullseye as builder
LABEL org.opencontainers.image.title="Parseable"
LABEL maintainer="Parseable Team "
@@ -22,10 +22,10 @@ LABEL org.opencontainers.image.vendor="Cloudnatively Pvt Ltd"
LABEL org.opencontainers.image.licenses="AGPL-3.0"
WORKDIR /parseable
-
COPY . .
RUN cargo build --release
+# final stage
FROM gcr.io/distroless/cc-debian11:nonroot
WORKDIR /parseable
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1ee47c176..9ca46c106 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,7 +5,6 @@ networks:
driver: bridge
services:
-
minio:
image: minio/minio:RELEASE.2023-02-10T18-48-39Z
entrypoint:
@@ -31,11 +30,10 @@ services:
- parseable-internal
parseable:
- image: parseablehq/parseable:v0.2.1
- # build:
- # context: .
- # dockerfile: Dockerfile
- # command: ["parseable", "s3-store"]
+ build:
+ context: .
+ dockerfile: Dockerfile
+ command: ["parseable", "s3-store"]
ports:
- 8000
environment:
@@ -45,8 +43,9 @@ services:
- P_S3_REGION=us-east-1
- P_S3_BUCKET=parseable
- P_STAGING_DIR=/tmp/data
- - P_USERNAME=admin
- - P_PASSWORD=admin
+ - P_USERNAME=parseableadmin
+ - P_PASSWORD=parseableadmin
+ - P_CHECK_UPDATE=false
networks:
- parseable-internal
healthcheck:
@@ -59,7 +58,7 @@ services:
quest:
image: ghcr.io/parseablehq/quest:main
- command: ["smoke", "http://parseable:8000", "admin", "admin"]
+ command: ["smoke", "http://parseable:8000", "parseableadmin", "parseableadmin"]
networks:
- parseable-internal
depends_on: