diff --git a/.tangled/workflows/deploy-api.yml b/.tangled/workflows/deploy-api.yml index 87437e1..3bc61cb 100644 --- a/.tangled/workflows/deploy-api.yml +++ b/.tangled/workflows/deploy-api.yml @@ -2,34 +2,30 @@ when: - event: ["push"] tag: ["v*"] -engine: nixery +engine: microvm +image: nixos -dependencies: - nixpkgs: - - kaniko +virtualisation: + docker: true environment: - DOCKER_CONFIG: "/kaniko/.docker" - REGISTRY: "atcr.io" - PROJECT: "tobinio.dev/task-line" + REGISTRY: atcr.io + PROJECT: tobinio.dev/task-line steps: - - name: Configure Kaniko + - name: Build and push API image command: | - mkdir -p /kaniko/.docker && mkdir -p /kaniko/tmp - echo "{ - \"auths\": { - \"$REGISTRY\": { - \"auth\": \"$(echo -n "$USERNAME:$PASSWORD" | base64)\" - } - } - }" > /kaniko/.docker/config.json - - - name: Build + Push API image - command: | - executor \ - --context=/tangled/workspace/ \ - --dockerfile=/tangled/workspace/Dockerfile.api \ - --destination=$REGISTRY/$PROJECT/api:$TANGLED_REF_NAME \ - --cache=false \ - --verbosity=info + set -euo pipefail + + echo "$PASSWORD" | docker login "$REGISTRY" \ + -u "$USERNAME" \ + --password-stdin + + image="$REGISTRY/$PROJECT/api:$TANGLED_REF_NAME" + + docker build \ + -f Dockerfile.api \ + -t "$image" \ + . + + docker push "$image" diff --git a/.tangled/workflows/deploy-nuxt.yml b/.tangled/workflows/deploy-nuxt.yml index 6581567..497db96 100644 --- a/.tangled/workflows/deploy-nuxt.yml +++ b/.tangled/workflows/deploy-nuxt.yml @@ -2,34 +2,30 @@ when: - event: ["push"] tag: ["v*"] -engine: nixery +engine: microvm +image: nixos -dependencies: - nixpkgs: - - kaniko +virtualisation: + docker: true environment: - DOCKER_CONFIG: "/kaniko/.docker" - REGISTRY: "atcr.io" - PROJECT: "tobinio.dev/task-line" + REGISTRY: atcr.io + PROJECT: tobinio.dev/task-line steps: - - name: Configure Kaniko + - name: Build and push Nuxt image command: | - mkdir -p /kaniko/.docker && mkdir -p /kaniko/tmp - echo "{ - \"auths\": { - \"$REGISTRY\": { - \"auth\": \"$(echo -n "$USERNAME:$PASSWORD" | base64)\" - } - } - }" > /kaniko/.docker/config.json - - - name: Build + Push Nuxt image - command: | - executor \ - --context=/tangled/workspace/ \ - --dockerfile=/tangled/workspace/Dockerfile.nuxt \ - --destination=$REGISTRY/$PROJECT/nuxt:$TANGLED_REF_NAME \ - --cache=false \ - --verbosity=info + set -euo pipefail + + echo "$PASSWORD" | docker login "$REGISTRY" \ + -u "$USERNAME" \ + --password-stdin + + image="$REGISTRY/$PROJECT/nuxt:$TANGLED_REF_NAME" + + docker build \ + -f Dockerfile.nuxt \ + -t "$image" \ + . + + docker push "$image" diff --git a/.tangled/workflows/lint.yml b/.tangled/workflows/lint.yml index f683be1..b438170 100644 --- a/.tangled/workflows/lint.yml +++ b/.tangled/workflows/lint.yml @@ -4,20 +4,19 @@ when: - event: ["pull_request"] branch: ["main"] -engine: nixery +engine: microvm +image: nixos dependencies: - nixpkgs: - - nodejs - - pnpm - - gnused + - nodejs + - pnpm steps: - name: Install command: pnpm install - name: Lint (Biome) - command: node_modules/@biomejs/cli-linux-x64-musl/biome ci + command: pnpm biome ci - name: Lint (Typescript) command: pnpm lint:typecheck