Skip to content

Commit

Permalink
Merge branch 'develop' into disconnect_server
Browse files Browse the repository at this point in the history
  • Loading branch information
Anish9901 authored Jan 17, 2025
2 parents b3e1f57 + 5dbf8be commit a068fc6
Show file tree
Hide file tree
Showing 51 changed files with 780 additions and 344 deletions.
32 changes: 4 additions & 28 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,39 +39,15 @@ jobs:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

# Learn more: https://docs.github.com/en/code-security/code-scanning
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
14 changes: 3 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#=========== STAGE: BASE =====================================================#
ARG PYTHON_VERSION=3.9-bookworm
ARG PYTHON_VERSION=3.13-bookworm
FROM python:$PYTHON_VERSION AS base

ENV PYTHONUNBUFFERED=1
ENV DOCKERIZE_VERSION v0.6.1
ARG BUILD_PG_MAJOR=15
ARG BUILD_PG_MAJOR=17
ENV PG_MAJOR=$BUILD_PG_MAJOR

RUN set -eux;
Expand Down Expand Up @@ -42,14 +42,6 @@ ENV PGDATA /var/lib/postgresql/mathesar
VOLUME /etc/postgresql/
VOLUME /var/lib/postgresql/

# We set the default STOPSIGNAL to SIGINT, which corresponds to what PostgreSQL
# calls "Fast Shutdown mode" wherein new connections are disallowed and any
# in-progress transactions are aborted, allowing PostgreSQL to stop cleanly and
# flush tables to disk, which is the best compromise available to avoid data
# corruption.

STOPSIGNAL SIGINT

EXPOSE 5432

# Mathesar source
Expand All @@ -59,7 +51,7 @@ COPY . .

#=========== STAGE: TESTING ==================================================#

ARG PYTHON_VERSION=3.9-bookworm
ARG PYTHON_VERSION=3.13-bookworm
FROM python:$PYTHON_VERSION AS testing

# Mathesar source
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.caddy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Useful when we need to build a single dockerfile to run a complete webservice
ARG BASE_IMAGE=python:3.9-buster
ARG BASE_IMAGE=python:3.13-bookworm
FROM $BASE_IMAGE as base_image

ENV PORT=8000
Expand All @@ -21,4 +21,4 @@ EXPOSE 2019

COPY Caddyfile /etc/caddy/Caddyfile

CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
37 changes: 0 additions & 37 deletions LICENSES/python-dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion api_tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PYTHON_VERSION=3.9-bookworm
ARG PYTHON_VERSION=3.13-bookworm
FROM python:$PYTHON_VERSION
WORKDIR /code/
COPY . .
Expand Down
Loading

0 comments on commit a068fc6

Please sign in to comment.