Skip to content

Commit

Permalink
new image for docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
mattiaBarbo committed Aug 12, 2024
1 parent 004de7b commit b0287e8
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 42 deletions.
32 changes: 13 additions & 19 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
# Usa l'immagine ufficiale di Python come base
FROM python:3.9-slim

# Install dependencies
RUN apt-get update && apt-get install -y \
curl \
git \
docker.io \
docker-compose

# Work Directory
# Imposta la directory di lavoro nel container
WORKDIR /app

# Clean and clone updated GitHub repo
RUN rm -rf /app/* && \
git clone --branch sqa https://github.com/HPCI-Lab/yProv.git .
# Installa curl
RUN apt-get update && apt-get install -y curl

# Copia l'intero contenuto della directory del progetto nella directory di lavoro del container
COPY . .

# Install requirements
COPY requirements.txt /app/requirements.txt
RUN pip install -r requirements.txt
# Assegna i permessi di esecuzione allo script 'tests.sh'
RUN chmod +x /app/tests/tests.sh

# Make the script_dockerfile.sh script executable and run it
COPY tests.sh /app/tests.sh
RUN chmod +x /app/tests.sh
# Installa le dipendenze del progetto, se necessario
RUN pip install --no-cache-dir -r requirements.txt

# Default command to keep the container running
CMD ["/app/tests.sh test"]
# Comando di default: esegue lo script 'tests.sh'
CMD ["/app/tests/tests.sh"]
File renamed without changes.
26 changes: 26 additions & 0 deletions hpci-yprov:1.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM python:3.9-slim

# Install dependencies
RUN apt-get update && apt-get install -y \
curl \
git \
docker.io \
docker-compose

# Work Directory
WORKDIR /app

# Clean and clone updated GitHub repo
RUN rm -rf /app/* && \
git clone --branch sqa https://github.com/HPCI-Lab/yProv.git .

# Install requirements
COPY requirements.txt /app/requirements.txt
RUN pip install -r requirements.txt

# Make the script_dockerfile.sh script executable and run it
COPY tests.sh /app/tests.sh
RUN chmod +x /app/tests.sh

# Default command to keep the container running
CMD ["/app/tests.sh"]
4 changes: 1 addition & 3 deletions tests.sh → hpci-yprov:1.3/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,4 @@ for i in {1..15}; do
sleep 10
done

if [[ "$1" == "test" ]]; then
python3 -m pytest -v
fi
python3 -m pytest -v
20 changes: 0 additions & 20 deletions tests/Dockerfile

This file was deleted.

0 comments on commit b0287e8

Please sign in to comment.