Compare commits

..

No commits in common. "feature/Appointment-Booking" and "main" have entirely different histories.

5 changed files with 55 additions and 113 deletions

View File

@ -40,28 +40,8 @@ steps:
volumes: volumes:
- name: docker_sock - name: docker_sock
path: /var/run/docker.sock path: /var/run/docker.sock
- name: Build and Push (PR) Container Image - name: Build and Push Container Image
image: plugins/docker image: plugins/docker
when:
branch:
- feature/*
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-${replace("${DRONE_BRANCH}", "/", "-")}
- name: Build and Push (Staging) Container Image
image: plugins/docker
when:
branch:
- develop
settings: settings:
username: username:
from_secret: DOCKER_USERNAME from_secret: DOCKER_USERNAME
@ -74,33 +54,56 @@ steps:
tags: tags:
- latest - latest
- dev - dev
- dev-${DRONE_COMMIT_SHA:0:10} - dev-build-${DRONE_COMMIT_SHA:0:7}
- name: Build and Push (Production) Container Image
image: plugins/docker
when: # - name: deploy-staging
branch: # image: plugins/ansible:latest
- main # settings:
settings: # playbook: ansible/playbook.staging.yml
username: # galaxy: ansible/requirements.yml
from_secret: DOCKER_USERNAME # inventory: ansible/inventory.yml
password: # become_user: bside
from_secret: DOCKER_PASSWORD # user: bside
repo: gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio # verbose: 4
registry: gitea.bsidesolutions.net # become: true
dockerfile: ./Dockerfile # list_tasks: true
force_tag: true # list_hosts: true
tags: # private_key:
- latest # from_secret: STAGING_SERVER_PRIVATE_KEY
- release # trigger:
- release-${DRONE_COMMIT_SHA:0:10} # branch:
trigger: # - master
branch: # - prod
- main # - qa
- develop # - feature/*
- feature/* # event:
event: # - push
include: # - pull_request
- push # ---
# kind: pipeline
# type: exec
# name: staging-deploy
# platform:
# os: linux
# arch: amd64
# steps:
# - name: ansible-deploy
# commands:
# - ansible --version
# - ansible-galaxy install --force --role-file ansible/requirements.yml -vvvv
# - ansible-playbook --inventory ansible/inventory.yml --list-hosts ansible/playbook.staging.yml
# trigger:
# branch:
# - master
# - prod
# - qa
# - feature/*
# event:
# - push
# - pull_request
volumes: volumes:
- name: docker_sock - name: docker_sock

View File

@ -1,47 +0,0 @@
name: 'Ollama Review'
on:
pull_request:
types: [opened, synchronize] # PR open시 자동 코드 리뷰 요청
jobs:
review-code-with-llm:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v43
- name: Setup Gitea CLI
run: |
LATEST_VERSION=$(curl -s https://dl.gitea.com/tea/ | \
grep -oP '(?<=href="/tea/)[^/"]*' | \
grep -E '^[0-9]+(\.[0-9]+){1,2}$' | \
sort -V | \
tail -n 1)
curl -L https://dl.gitea.com/tea/${LATEST_VERSION}/tea-${LATEST_VERSION}-linux-amd64 -o /usr/local/bin/tea
chmod +x /usr/local/bin/tea
tea --version
tea --version
tea login add --name gitea --url ${{ gitea.server_url }} --token ${{ secrets.token }}
tea login default gitea
- name: Review code
env:
GITEA_TOKEN: ${{ secrets.token }}
run: |
for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
review=$(curl -s https://ollama.bsidesolutions.net/api/generate -d '{"model": "${{ inputs.model }}", "prompt": "Review the following file:\n\n```\n$(cat $file)\n```", "stream": false}' | jq -r '.response')
comment="Ollama Code Review for \`$file\`:\n\n$review"
echo "$comment" >> ollama_review.txt
done
tea pr comment ${{ gitea.event.pull_request.number }} --body "$(cat ollama_review.txt)"
shell: bash

View File

@ -24,6 +24,10 @@ jobs:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v4 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 - name: Deploy to Coolify
uses: carlozanella/deploy-coolify@v1 uses: carlozanella/deploy-coolify@v1
with: with:

View File

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