Compare commits

...

2 Commits

Author SHA1 Message Date
43ea42397f add some conditional deploy syntax
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build was killed
2025-03-07 13:54:22 -05:00
1003b27e95 - working on appointments block
(cherry picked from commit 7a010a4f8e0362b0f344e8fe5cf8df58f2cf5e65)
2025-03-05 14:22:30 -05:00
4 changed files with 69 additions and 7 deletions

View File

@ -40,8 +40,30 @@ steps:
volumes:
- name: docker_sock
path: /var/run/docker.sock
- name: Build and Push Container Image
- name: Build and Push (PR) Container Image
image: plugins/docker
when:
branch:
- feature/*
pull_request:
types: [opened, updated]
settings:
username:
from_secret: DOCKER_USERNAME
password:
from_secret: DOCKER_PASSWORD
repo: gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio
registry: gitea.bsidesolutions.net
dockerfile: ./Dockerfile
force_tag: true
tags:
- latest
- pr-build-${DRONE_COMMIT_SHA:0:10}
- name: Build and Push (Staging) Container Image
image: plugins/docker
when:
branch:
- develop
settings:
username:
from_secret: DOCKER_USERNAME
@ -54,8 +76,34 @@ steps:
tags:
- latest
- dev
- dev-build-${DRONE_COMMIT_SHA:0:7}
- dev-${DRONE_COMMIT_SHA:0:10}
- name: Build and Push (Production) Container Image
image: plugins/docker
when:
branch:
- main
settings:
username:
from_secret: DOCKER_USERNAME
password:
from_secret: DOCKER_PASSWORD
repo: gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio
registry: gitea.bsidesolutions.net
dockerfile: ./Dockerfile
force_tag: true
tags:
- latest
- release
- release-${DRONE_COMMIT_SHA:0:10}
trigger:
branch:
- main
- develop
- feature/*
event:
include:
- pull_request
- push
# - name: deploy-staging
# image: plugins/ansible:latest

View File

@ -24,10 +24,6 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v4
# - name: Login to Gitea
# run: |
# echo "${{ secrets.TOKEN }}" | docker login ${{ gitea.server_url }} --username ${{ gitea.actor }} --password-stdin
- name: Deploy to Coolify
uses: carlozanella/deploy-coolify@v1
with:

View File

@ -0,0 +1,16 @@
const GoogleAppointmentBlock = () => {
const {GOOGLE_APPOINTMENTS_LINK} = process.env;
console.log(GOOGLE_APPOINTMENTS_LINK)
return (
<div className='w-full h-full flex flex-row justify-center bg-white border-solid'>
<embed
src={GOOGLE_APPOINTMENTS_LINK!}
style={{border: 1}}
width="100%"
height="600"
></embed>
</div>
);
}
export default GoogleAppointmentBlock;

View File

@ -8,6 +8,7 @@ import navigationContent from '../lib/navigationContent'
import ContactForm from '@/components/form/ContactForm';
import Footer from '@/components/footer';
import Link from 'next/link';
import GoogleAppointmentBlock from '@/components/form/GoogleAppointmentBlock';
const inter = Inter({ subsets: ['latin'] })
export default function Home() {
@ -119,6 +120,7 @@ export default function Home() {
<div className='flex flex-row h-full w-full justify-center'>
<div className='flex flex-col h-full w-full justify-center'>
<ContactForm/>
{/* <GoogleAppointmentBlock/> */}
</div>
<span className="cursor-pointer self-end" onClick={() => {
executeScrollToLandiing();