Skip to content

Commit

Permalink
merging main into staging (#7)
Browse files Browse the repository at this point in the history
* g (#4)

* Create auto-pr-main-to-staging.yml (#5)
  • Loading branch information
himynamesdave authored Nov 5, 2024
1 parent 11be710 commit 0af5fad
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 6 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/auto-pr-main-to-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Create a PR to Staging when commit to main
description: Simplifies the workflow for pushing app to staging

on:
push:
branches:
- main

jobs:
create-pr:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Create PR from main to staging
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.GITHUB_TOKEN }}
base: staging
head: main
title: "Create PR from main to staging"
body: "This PR was automatically created to sync changes from `main` to `staging`."
branch: auto-pr-main-to-staging
delete-branch: true
6 changes: 0 additions & 6 deletions Dockerfile.deploy
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FROM python:3.11
ENV PYTHONUNBUFFERED=1

# Arguments
ARG EMAIL_HOST_USER=
ARG DJANGO_SECRET=
ARG DJANGO_DEBUG=
ARG CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP=
Expand All @@ -12,7 +10,6 @@ ARG BIN_LIST_API_KEY=
ARG OPENAI_API_KEY=
ARG OPENAI_MODEL=
ARG INPUT_TOKEN_LIMIT=
ARG INPUT_TOKEN_LIMIT=
ARG CTIBUTLER_HOST=
ARG CTIBUTLER_APIKEY=
ARG VULMATCH_HOST=
Expand All @@ -25,7 +22,6 @@ ARG R2_ACCESS_KEY=
ARG R2_SECRET_KEY=
ARG R2_CUSTOM_DOMAIN=

# Set environment variables
ENV DJANGO_SECRET=${DJANGO_SECRET}
ENV DJANGO_DEBUG=${DJANGO_DEBUG}
ENV CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP=${CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP}
Expand All @@ -46,8 +42,6 @@ ENV R2_BUCKET_NAME=${R2_BUCKET_NAME}
ENV R2_ACCESS_KEY=${R2_ACCESS_KEY}
ENV R2_CUSTOM_DOMAIN=${R2_CUSTOM_DOMAIN}



WORKDIR /usr/src/app
COPY requirements.txt ./
RUN pip install -r requirements.txt
Expand Down

0 comments on commit 0af5fad

Please sign in to comment.