fix: docker build

This commit is contained in:
aprilthepink 2024-05-17 11:06:16 +02:00
parent b8bac014a2
commit c7798ac5e4
3 changed files with 14 additions and 19 deletions

View file

@ -5,8 +5,6 @@ on:
branches: [ "main" ] branches: [ "main" ]
# Publish semver tags as releases. # Publish semver tags as releases.
tags: [ 'v*.*.*' ] tags: [ 'v*.*.*' ]
pull_request:
branches: [ "main" ]
env: env:
# Use docker.io for Docker Hub if empty # Use docker.io for Docker Hub if empty
@ -51,17 +49,13 @@ jobs:
uses: docker/metadata-action@v5 # v5.0.0 uses: docker/metadata-action@v5 # v5.0.0
with: with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- uses: DeterminateSystems/nix-installer-action@main
- name: Build and push Docker image - uses: DeterminateSystems/magic-nix-cache-action@main
id: build-and-push - uses: DeterminateSystems/flake-checker-action@main
uses: docker/build-push-action@v5 # v5.0.0 - name: Build docker package
with: run: nix build .#ociImage
context: . - name: Load Docker image
push: ${{ github.event_name != 'pull_request' }} run: docker load < result
tags: ${{ steps.meta.outputs.tags }} - name: Push image to registry
labels: ${{ steps.meta.outputs.labels }} if: github.event_name != 'pull_request'
provenance: mode=max run: docker push ghcr.io/$IMAGE_NAME -a
sbom: true
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max

View file

@ -79,7 +79,8 @@
}; };
packages.ociImage = pkgs.dockerTools.buildLayeredImage packages.ociImage = pkgs.dockerTools.buildLayeredImage
{ {
name = "lysand-ap-layer"; name = "ghcr.io/lysand-org/activitypub";
tag = "main";
contents = [ contents = [
config.packages.lysand-ap-layer config.packages.lysand-ap-layer
config.packages.ls-ap-migration config.packages.ls-ap-migration

View file

@ -150,8 +150,8 @@ async fn main() -> actix_web::Result<(), anyhow::Error> {
env_logger::init_from_env(env_logger::Env::new().default_filter_or("info")); env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
//TODO remove this //TODO remove this
lysand::test::main().await?; //lysand::test::main().await?;
return Ok(()); //return Ok(());
let ap_id = Url::parse(&format!( let ap_id = Url::parse(&format!(
"https://{}/{}", "https://{}/{}",