Commit 21d1566f authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Merge branch 'pasture' into testing

parents 81d1b0a5 74852db8
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ services:
    container_name: base
  redis:
    image: git.ia2.inaf.it:5050/vospace/vospace-transfer-service/job_cache
    volumes:
      - redis_data:/data
    command: ["redis-server", "--appendonly", "yes"]
    container_name: job_cache
    networks:
    - backend_net
@@ -25,7 +28,8 @@ services:
    volumes:
      - local:/home
      - hot_storage:/mnt/hot_storage/users/
      - "/home/cristiano/.ssh:/root/.ssh"
      - redis_data:/redis_data
      - "/home/${USER}/.ssh:/root/.ssh"
    build: ./transfer_service
    container_name: transfer_service
    depends_on:
@@ -105,5 +109,6 @@ services:
volumes:
  hot_storage:
  local:
  redis_data:
networks:
  backend_net:
+7 −1
Original line number Diff line number Diff line
@@ -7,7 +7,13 @@ RUN useradd -m -s /bin/bash server
# Test user folders
RUN mkdir -p /mnt/hot_storage/users/cristiano.urban && \
    mkdir -p /mnt/hot_storage/users/sara.bertocco && \
    mkdir -p /mnt/hot_storage/users/sonia.zorba
    mkdir -p /mnt/hot_storage/users/sonia.zorba && \
    mkdir -p /mnt/hot_storage/users/ari-l
    
# Copy files for import test
COPY test_import/testdir/ /mnt/hot_storage/users/ari-l/test_import/testdir/
COPY test_import/testdir-md5sum.txt /mnt/hot_storage/users/ari-l/test_import/
RUN chmod -R 755 /mnt/hot_storage/users/ari-l/test_import

# Set up a workdir for the container
WORKDIR /home/server/
+1 −0
Original line number Diff line number Diff line
1181c1834012245d785120e3505ed169  ./test111.txt
+1 −0
Original line number Diff line number Diff line
111
+1 −0
Original line number Diff line number Diff line
348bd3ce10ec00ecc29d31ec97cd5839  ./test222.txt
Loading