Commit 9fe3d2fa authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Modified username format + minor changes. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent 82df5e7b

client/vos_storage

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class AMQPClient(object): 
        storageHostname = None

        while not storageType in ("cold", "hot", "portal"):

                try:

                    storageType = input("Storage type: ")

                    storageType = input("\nStorage type [cold, hot or portal]: ")

                except ValueError:

                    print("Input type is not valid!")

                except EOFError:
@@ -49,7 +49,7 @@ class AMQPClient(object): 
                except KeyboardInterrupt:

                    sys.exit("\nCTRL+C detected. Exiting...")

        try:

            storageBasePath = input("Storage base path: ")

            storageBasePath = input("\nStorage base path: ")

        except ValueError:

            print("Input type is not valid!")

        except EOFError:
@@ -57,7 +57,7 @@ class AMQPClient(object): 
        except KeyboardInterrupt:

            sys.exit("\nCTRL+C detected. Exiting...")

        try:

            storageHostname = input("Storage hostname: ")

            storageHostname = input("\nStorage hostname: ")

        except ValueError:

            print("Input type is not valid!")

        except EOFError:

server/Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ FROM git.ia2.inaf.it:5050/vospace/vospace-transfer-service/base 
RUN useradd -m -s /bin/bash server



# Test user folders

RUN mkdir -p /mnt/hot_storage/users/curban && \

    mkdir -p /mnt/hot_storage/users/sbertocco && \

    mkdir -p /mnt/hot_storage/users/szorba

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



# Set up a workdir for the container

WORKDIR /home/server/

transfer_service/Dockerfile

+27 −27
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ FROM git.ia2.inaf.it:5050/vospace/vospace-transfer-service/base 
RUN useradd -m -s /bin/bash transfer_service



# Test users

RUN useradd -m -s /bin/bash szorba

RUN useradd -m -s /bin/bash sbertocco

RUN useradd -m -s /bin/bash curban

RUN useradd -m -s /bin/bash sonia.zorba

RUN useradd -m -s /bin/bash sara.bertocco

RUN useradd -m -s /bin/bash cristiano.urban



# Set up a workdir for the container

WORKDIR /home/transfer_service/
@@ -24,30 +24,30 @@ RUN chown transfer_service wait-for-it.sh *.py && \ 
    chmod 755 wait-for-it.sh *.py



# Create a 'store' directory with some files for various users

RUN mkdir /home/curban/store /home/curban/retrieve && \

    echo "foo?!" > /home/curban/store/foo2.txt && \

    mkdir /home/curban/store/mydir && \

    echo "Another foo!" > /home/curban/store/mydir/another_foo2.txt && \

    mkdir /home/curban/store/mydir/dir2 && \

    echo "fooX" > /home/curban/store/mydir/dir2/fooX.txt && \

    chown -R curban:curban /home/curban/store && \

    chown -R curban:curban /home/curban/retrieve && \

    chmod -R 755 /home/curban/store &&\ 

    chmod -R 755 /home/curban/retrieve && \

    mkdir /home/sbertocco/store /home/sbertocco/retrieve && \

    touch /home/sbertocco/store/foo4.txt && \

    echo "foo4" > /home/sbertocco/store/foo4.txt && \

    chown -R sbertocco:sbertocco /home/sbertocco/store && \

    chown -R sbertocco:sbertocco /home/sbertocco/retrieve && \

    chmod -R 755 /home/sbertocco/store && \

    chmod -R 755 /home/sbertocco/retrieve && \

    mkdir -p /home/szorba/store/aaa/bbb && mkdir /home/szorba/retrieve && \

    touch /home/szorba/store/aaa/bbb/foo5.txt && \

    echo "foo5" > /home/szorba/store/aaa/bbb/foo5.txt && \

    chown -R szorba:szorba /home/szorba/store && \

    chown -R szorba:szorba /home/szorba/retrieve && \    

    chmod -R 755 /home/szorba/store && \

    chmod -R 755 /home/szorba/retrieve

RUN mkdir /home/cristiano.urban/store /home/cristiano.urban/retrieve && \

    echo "foo?!" > /home/cristiano.urban/store/foo2.txt && \

    mkdir /home/cristiano.urban/store/mydir && \

    echo "Another foo!" > /home/cristiano.urban/store/mydir/another_foo2.txt && \

    mkdir /home/cristiano.urban/store/mydir/dir2 && \

    echo "fooX" > /home/cristiano.urban/store/mydir/dir2/fooX.txt && \

    chown -R cristiano.urban:cristiano.urban /home/cristiano.urban/store && \

    chown -R cristiano.urban:cristiano.urban /home/cristiano.urban/retrieve && \

    chmod -R 755 /home/cristiano.urban/store &&\ 

    chmod -R 755 /home/cristiano.urban/retrieve && \

    mkdir /home/sara.bertocco/store /home/sara.bertocco/retrieve && \

    touch /home/sara.bertocco/store/foo4.txt && \

    echo "foo4" > /home/sara.bertocco/store/foo4.txt && \

    chown -R sara.bertocco:sara.bertocco /home/sara.bertocco/store && \

    chown -R sara.bertocco:sara.bertocco /home/sara.bertocco/retrieve && \

    chmod -R 755 /home/sara.bertocco/store && \

    chmod -R 755 /home/sara.bertocco/retrieve && \

    mkdir -p /home/sonia.zorba/store/aaa/bbb && mkdir /home/sonia.zorba/retrieve && \

    touch /home/sonia.zorba/store/aaa/bbb/foo5.txt && \

    echo "foo5" > /home/sonia.zorba/store/aaa/bbb/foo5.txt && \

    chown -R sonia.zorba:sonia.zorba /home/sonia.zorba/store && \

    chown -R sonia.zorba:sonia.zorba /home/sonia.zorba/retrieve && \    

    chmod -R 755 /home/sonia.zorba/store && \

    chmod -R 755 /home/sonia.zorba/retrieve



# Run a shell

CMD /bin/bash