chore: create image from template

.cargo/config.toml

@@ -13,5 +13,3 @@ linker = "aarch64-linux-gnu-gcc"
 [target.aarch64-unknown-linux-musl]
 linker = "aarch64-linux-musl-gcc"
 rustflags = ["-C", "target-feature=-crt-static"]
-
-

.env.example

@@ -14,3 +14,11 @@ MONITOR_POLLING_INTERVAL_IN_SECS=5
 MONITOR_TASK_RETENTION_PERIOD_IN_SECS=864000
 
 RUST_LOG=ERROR
+
+# POSTGRES ENV FOR CREATE DB
+PG_DATABASE_TEMPLATE=
+PG_DATABASE_ADMIN=
+SCYLLA_CREATE_DB=
+
+# FOR DROPPING THE DB
+#SCYLLA_CLEANUP_MODE=

.github/workflows/npm_publish.yml

@@ -81,7 +81,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         if: ${{ !matrix.settings.docker }}
         with:
-          toolchain: stable
+          toolchain: stable 3 months ago
           target: ${{ matrix.settings.target }}
       - name: Cache cargo
         uses: actions/cache@v4
@@ -177,5 +177,4 @@ jobs:
       - run: ls -R ./scylla_pg_js/artifacts
 
       - name: Publish
-        run: PATH=$PATH:$(pwd) bin/npm-release.sh # only run on release created or tag
-
+        run: PATH=$PATH:$(pwd) bin/npm-release.sh # only run on release created or tag

.github/workflows/rust_build.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/[email protected]
         with:
-          toolchain: stable
+          toolchain: stable 3 months ago
       - run: bin/ubuntu-setup.sh
       - run: rustup component add rustfmt clippy
       - name: cargo build

Cargo.toml

@@ -15,4 +15,3 @@ log = { version = "0.4", features = [
   "std",
   "kv_unstable_serde",
 ] }
-env_logger = "0.10"

Dockerfile.scylla_pg_migration

@@ -17,7 +17,7 @@ RUN adduser \
 WORKDIR /tmp
 COPY ./ .
 # Build binary in release mode
-RUN cargo build --release --bin db_migrate
+RUN cargo build --release --package scylla_pg_core
 
 #
 # Run image based on buster-slim to reduce image size while still using glibc
@@ -30,7 +30,10 @@ COPY --from=BUILD /etc/passwd /etc/passwd
 COPY --from=BUILD /etc/group /etc/group
 # Copy binary from build
 COPY --from=BUILD /tmp/target/release/db_migrate ./
+COPY --from=BUILD /tmp/target/release/db_create ./
+COPY --from=BUILD /tmp/target/release/db_delete ./
+COPY --from=BUILD /tmp/bin/create_db_and_migrate.sh ./
 # Use an unprivileged user
 USER ${USER}:${USER}
 # Entry point
-CMD ["/opt/build/db_migrate"]
+CMD ["/opt/build/create_db_and_migrate.sh"]

Makefile

@@ -67,6 +67,12 @@ pg.monitor:
 db.migrate:
 	$(call pp,db migrate...)
 	cargo run --bin db_migrate
+
+## db.create: 🧪 Creates a new DB
+db.create:
+	$(call pp,db migrate...)
+	cargo run --bin db_create
+# cargo run --bin db_delete
 truncate:
 	$(call pp, truncate...)
 	RUSTFLAGS="" cargo run --bin truncate

bin/component-test-setup.sh

@@ -4,10 +4,13 @@ echo PG_HOST=127.0.0.1 >> .env
 echo PG_USER=admin >> .env
 echo PG_PASSWORD=admin >> .env
 echo PG_DATABASE=scylla >> .env
+echo PG_DATABASE_ADMIN=postgres >> .env
 echo PG_PORT=5432 >> .env
 echo PG_POOL_SIZE=10 >> .env
-echo DB_ENV=mig-test >> .env
 # run db-migrations
+make withenv RECIPE=db.create
+# sleep
+sleep 3
 make withenv RECIPE=db.migrate