Compare commits

8 Commits

Author SHA1 Message Date
0a2dde8009 Add fallback for img src's
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-19 18:59:51 +02:00
523b7c9fd7 Merge branch 'main' into t-work 2024-05-19 18:52:44 +02:00
3wc
e99eb97462 Ensure we build -dev container locally
All checks were successful
continuous-integration/drone/push Build is passing
Re autonomic-cooperative/astro-payload-template#22
2024-05-19 13:41:14 -03:00
6d213b7644 Merge branch 'main' into t-work 2024-05-19 18:30:12 +02:00
3wc
d30cd24f54 Fix media volume path
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is failing
Ref autonomic-cooperative/astro-payload-template#22
2024-05-19 13:00:59 -03:00
3wc
a87bff676b Fix Payload local instance
All checks were successful
continuous-integration/drone/push Build is passing
Fixes autonomic-cooperative/astro-payload-template#23
2024-05-19 12:55:40 -03:00
3wc
5d84e7b38d Fix Drone config
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-19 12:37:14 -03:00
3wc
b1e2c8d30b Publish payload dev container also
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2024-05-19 12:36:14 -03:00
7 changed files with 27 additions and 18 deletions

View File

@ -14,7 +14,20 @@ steps:
registry: git.autonomic.zone
context: astro
dockerfile: astro/Dockerfile
- name: publish payload container
- name: publish payload dev container
image: plugins/docker
settings:
username: 3wordchant
password:
from_secret: git_autonomic_zone_token_3wc
# NOTE: edit this if you want your image called something else
repo: git.autonomic.zone/autonomic-cooperative/astro-payload-test-payload-dev
auto_tag: true
registry: git.autonomic.zone
context: payload
dockerfile: payload/Dockerfile
target: dev
- name: publish payload prod container
image: plugins/docker
settings:
username: 3wordchant
@ -46,7 +59,7 @@ steps:
DRONE_URL: "https://drone.autonomic.zone"
PAYLOAD_URL: "https://admin.paystro.swarm-demo.autonomic.zone"
depends_on:
- publish payload container
- publish payload prod container
trigger:
branch:
- main

BIN
astro/public/not-found.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -12,7 +12,7 @@ const contentArray = getContentArray(content);
} else {
return (
<Image
src={getImageSrc(value.src)}
src={getImageSrc(value.src) || "/not-found.png"}
width={value.width}
height={value.height}
format="webp"

View File

@ -8,10 +8,10 @@ const { post } = Astro.props;
href={`/posts/${post.id}/`}
>
<article class="flex px-5 py-3 gap-8">
<Image
src={post.thumbnail.url}
height="150"
aspectRatio="1"
<Image
src={post.thumbnail.url || "/not-found"}
height={150}
aspectRatio={1}
format="webp"
alt={post.thumbnail.alt}
/>

View File

@ -19,11 +19,12 @@ services:
- payload
payload:
image: git.autonomic.zone/autonomic-cooperative/astro-payload-test-payload:latest
image: git.autonomic.zone/autonomic-cooperative/astro-payload-test-payload-dev:latest
container_name: ${NAME}-payload
restart: unless-stopped
build:
context: payload
target: dev
environment:
DEV: 1
NAME: ${NAME}
@ -31,15 +32,11 @@ services:
PAYLOAD_URL: "http://localhost:${PAYLOAD_PORT}"
PAYLOAD_PORT: ${PAYLOAD_PORT}
PAYLOAD_SECRET: ${PAYLOAD_SECRET}
MONGODB_USER:
MONGODB_HOST: mongo
MONGODB_PASSWORD:
MONGODB_PORT: 27017
MONGODB_URI: "mongodb://$MONGODB_USER:$MONGODB_PASSWORD@mongo:27017"
volumes:
- ./payload/src:/base/src
- ./astro/src/types.ts:/types.ts
volumes:
- payload_media:/prod/dist/media
# - ./astro/src/types.ts:/types.ts
- payload_media:/base/src/media
ports:
- ${PAYLOAD_PORT}:${PAYLOAD_PORT}
networks:

View File

@ -4,8 +4,8 @@
"license": "AGPL-3.0-or-later",
"version": "1.2",
"scripts": {
"dev": "docker compose up",
"dev": "docker compose up --build",
"stop": "docker compose down",
"dev:build": "docker compose up --build"
"dev:nobuild": "docker compose up"
}
}

View File

@ -9,7 +9,6 @@ ENV NODE_ENV=development
EXPOSE 3001
CMD ["yarn","dev"]
FROM base AS build
ENV NODE_ENV=production
WORKDIR /build