Skip to content

Commit

Permalink
Fixes for updated dependencies, update README (#68)
Browse files Browse the repository at this point in the history
  • Loading branch information
veluca93 authored Dec 11, 2024
1 parent 261b359 commit 4d590ad
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN yarn build
# BACKEND
# ------------------------------------------------------

FROM python:3.11-slim-bullseye AS backend-builder
FROM python:3.11-slim-bookworm AS backend-builder

WORKDIR /terry

Expand All @@ -40,7 +40,7 @@ RUN ./setup.py install
# COMMUNICATION
# ------------------------------------------------------

FROM rust:1.69 as communication-builder
FROM rust:1.83 as communication-builder

COPY communication/src /build/src
COPY communication/Cargo.toml /build
Expand All @@ -56,13 +56,12 @@ RUN cargo build --release
# FINAL IMAGE
# ------------------------------------------------------

FROM python:3.11-slim-bullseye AS without-communication
FROM python:3.11-slim-bookworm AS without-communication

# Install system dependencies and task dependencies
RUN apt-get update && \
apt-get install -y curl nginx procps zip '^python3?$' '^python3?-(wheel|pip|numpy|sortedcontainers)$' && \
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2 && \
pip2 install numpy sortedcontainers
apt-get install -y \
curl nginx procps zip '^python3?$' '^python3?-(wheel|pip|numpy|sortedcontainers)$'

# Frontend
COPY --from=frontend-builder /frontend/build /app
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# terry
[![Tests](https://github.com/algorithm-ninja/terry/actions/workflows/test.yml/badge.svg)](https://github.com/algorithm-ninja/terry/actions/workflows/test.yml)
[![Code Climate](https://codeclimate.com/github/algorithm-ninja/terry/badges/gpa.svg)](https://codeclimate.com/github/algorithm-ninja/terry)
[![Coverage Status](https://coveralls.io/repos/github/algorithm-ninja/terry/badge.svg?branch=master)](https://coveralls.io/github/algorithm-ninja/terry?branch=master)
[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.png?v=103)](https://github.com/algorithm-ninja/terry)
[![license](https://img.shields.io/github/license/algorithm-ninja/terry.svg)](https://github.com/algorithm-ninja/terry/blob/master/LICENSE)
[![Tests](https://github.com/olimpiadi-informatica/terry/actions/workflows/test.yml/badge.svg)](https://github.com/olimpiadi-informatica/terry/actions/workflows/test.yml)
[![Code Climate](https://codeclimate.com/github/olimpiadi-informatica/terry/badges/gpa.svg)](https://codeclimate.com/github/olimpiadi-informatica/terry)
[![Coverage Status](https://coveralls.io/repos/github/olimpiadi-informatica/terry/badge.svg?branch=master)](https://coveralls.io/github/olimpiadi-informatica/terry?branch=master)
[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.png?v=103)](https://github.com/olimpiadi-informatica/terry)
[![license](https://img.shields.io/github/license/olimpiadi-informatica/terry.svg)](https://github.com/olimpiadi-informatica/terry/blob/master/LICENSE)

**terry** is a Google-Code-Jam-like programming contest environment designed for the territorial phase of the Italian Olympiad in Informatics (OII, _Olimpiadi Italiane di Informatica_).

## Specification of the terry format

You can find the specification of the format accepted by `terry` [here](https://github.com/algorithm-ninja/terry/blob/master/format-specs.md).
You can find the specification of the format accepted by `terry` [here](https://github.com/olimpiadi-informatica/terry/blob/master/format-specs.md).

## Setup a production-like environment

1. Clone recursively this repo `git clone --recurse-submodules https://github.com/algorithm-ninja/terry`
1. Clone recursively this repo `git clone --recurse-submodules https://github.com/olimpiadi-informatica/terry`
2. Follow the instructions in `backend/`
3. Place the zip of the contest in the folder set in the backend config file
4. Setup the frontend
Expand Down Expand Up @@ -149,7 +149,7 @@ That file is present, unencrypted, in the contest pack.
It will be shown in the admin page before the contest extraction.
The content of this file is also used to make the `contest.yaml` files, the name and description of the contest are get from there.

You can find the specification of the format of this file [here](https://github.com/algorithm-ninja/terry/blob/master/format-specs.md#public-metadata).
You can find the specification of the format of this file [here](https://github.com/olimpiadi-informatica/terry/blob/master/format-specs.md#public-metadata).

### Making a pack

Expand Down

0 comments on commit 4d590ad

Please sign in to comment.