Commit 925979f9 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Merge branch 'testing'

parents 688b4045 dd5196b1

docker-compose.yml

+7 −7
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ services: 
    image: redis

    container_name: redis

    networks:

    - vospace_backend_net

    - backend_net

    ports:

    - "6379:6379"

  rabbitmq:
@@ -13,7 +13,7 @@ services: 
    depends_on:

    - redis

    networks:

    - vospace_backend_net

    - backend_net

    ports:

    - "5672:5672"

    - "15672:15672"
@@ -23,7 +23,7 @@ services: 
    build: ./tape_frontend

    container_name: tape_frontend

    networks:

    - vospace_backend_net

    - backend_net

    stdin_open: true

    tty: true

  transfer_node:
@@ -32,7 +32,7 @@ services: 
    depends_on:

    - tape_frontend

    networks:

    - vospace_backend_net

    - backend_net

    stdin_open: true

    tty: true

  transfer_service:
@@ -41,7 +41,7 @@ services: 
    depends_on:

    - rabbitmq

    networks:

    - vospace_backend_net

    - backend_net

    stdin_open: true

    tty: true

    command: ["./wait-for-it.sh", "rabbitmq:5672", "--", "python3", "transfer_service.py"]
@@ -49,8 +49,8 @@ services: 
    build: ./test_client

    container_name: test_client

    networks:

    - vospace_backend_net

    - backend_net

    stdin_open: true

    tty: true

networks:

  vospace_backend_net:
 
  backend_net:

tape_frontend/Dockerfile

+7 −7
Original line number Diff line number Diff line
@@ -7,22 +7,22 @@ RUN yum -y update 
# Install epel repo

RUN yum -y install epel-release



# Install xrootd-server package and python bindings

RUN yum -y install xrootd-server python36-xrootd

# Install xrootd-server package

RUN yum -y install xrootd-server



# Copy authentication directives config file and set the right permissions

COPY auth_file /etc/xrootd/

RUN chown xrootd:xrootd /etc/xrootd/auth_file && \

    chmod 0644 /etc/xrootd/auth_file



# Create a new user called centos, create the home directory and set the default shell

RUN useradd -m -s /bin/bash centos

# Create a new user called tape_frontend, create the home directory and set the default shell

RUN useradd -m -s /bin/bash tape_frontend



# Switch to centos user

USER centos

# Switch to tape_frontend user

USER tape_frontend



# Set home environment variable

ENV HOME=/home/centos/

ENV HOME=/home/tape_frontend/



# Set the HOME as working directory

WORKDIR $HOME

tape_frontend/auth_file

+1 −1
Original line number Diff line number Diff line 
# All users have read access to 'data' folder

u * /home/centos/data rl 
u * /home/tape_frontend/data rl

tape_frontend/xrootd.cfg

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
all.role server



# Default is /tmp

all.export /home/centos/data

all.export /home/tape_frontend/data



# Default xrd port

xrd.port 1094

transfer_node/Dockerfile

+24 −7
Original line number Diff line number Diff line
@@ -4,17 +4,34 @@ FROM centos:7 
# Check for updates and install them

RUN yum -y update



# Create a new user called centos, create the home directory and set the default shell

RUN useradd -m -s /bin/bash centos

# Install epel repo

RUN yum -y install epel-release



# Switch to centos user

USER centos

# Install xrootd-server package

RUN yum -y install xrootd-server



# Copy authentication directives config file and set the right permissions

COPY auth_file /etc/xrootd/

RUN chown xrootd:xrootd /etc/xrootd/auth_file && \

    chmod 0644 /etc/xrootd/auth_file



# Create a new user called transfer_node, create the home directory and set the default shell

RUN useradd -m -s /bin/bash transfer_node



# Switch to transfer_node user

USER transfer_node



# Set home environment variable

ENV HOME=/home/centos/

ENV HOME=/home/transfer_node/



# Set the HOME as working directory

WORKDIR $HOME



# Execute a bash shell

CMD /bin/bash
 
# Copy xrootd main config file into the current work dir

COPY xrootd.cfg .



# Create a dir to store and expose data

RUN mkdir data



# Execute xrootd service to expose data

CMD /bin/xrootd -c xrootd.cfg ${HOME}/data