Commit a8748117 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

minor bug fix for qcor driver (linking on alpine), updates to alpine dockerfiles 



Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent 03d789c8

docker/ci/alpine/code-server/Dockerfile

+17 −3
Original line number Diff line number Diff line 
FROM qcor/qcor-alpine

ENV VERSION=3.11.0



RUN apk add nodejs openssh-client gnupg bash && \

RUN apk add nodejs openssh-client gnupg bash sudo curl && \

   wget https://github.com/cdr/code-server/releases/download/v$VERSION/code-server-$VERSION-linux-amd64.tar.gz && \

   tar x -zf code-server-$VERSION-linux-amd64.tar.gz && \

   rm code-server-$VERSION-linux-amd64.tar.gz && \
@@ -9,7 +9,21 @@ RUN apk add nodejs openssh-client gnupg bash && \ 
   rm code-server-$VERSION-linux-amd64/code-server && \

   rm code-server-$VERSION-linux-amd64/lib/node && \

   mv code-server-$VERSION-linux-amd64 /usr/lib/code-server && \

   sed -i 's/"$ROOT\/lib\/node"/node/g'  /usr/lib/code-server/bin/code-server 

   sed -i 's/"$ROOT\/lib\/node"/node/g'  /usr/lib/code-server/bin/code-server \

   && adduser --gecos '' --disabled-password coder \

   && echo "coder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd \

   && curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.5.1/fixuid-0.5.1-linux-amd64.tar.gz" | tar -C /usr/local/bin -xzf - \

   && chown root:root /usr/local/bin/fixuid \

   && chmod 4755 /usr/local/bin/fixuid \

   && mkdir -p /etc/fixuid \

   && printf "user: coder\ngroup: coder\n" > /etc/fixuid/config.yml \

   && rm -rf fixuid-0.5-linux* \

   && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2



USER 1000

ENV USER=coder

WORKDIR /home/coder

RUN git clone https://github.com/ornl-qci/qcor && cp -r qcor/examples cpp-examples \

   && cp -r qcor/python/examples py-examples && rm -rf qcor 



ENTRYPOINT ["/usr/lib/code-server/bin/code-server", "--bind-addr", "0.0.0.0:8080", "--auth", "none", "."]
 
# CMD ["--bind-addr 0.0.0.0:8080"]
 
 No newline at end of file

docker/ci/alpine/llvm/Dockerfile

+2 −2
Original line number Diff line number Diff line 
from xacc/alpine

run git clone https://github.com/ornl-qci/llvm-project-csp \

FROM xacc/alpine

RUN git clone https://github.com/ornl-qci/llvm-project-csp \

   && apk add ninja \

   && cd llvm-project-csp/ && mkdir build && cd build/ \

   && cmake -G Ninja ../llvm -DCMAKE_INSTALL_PREFIX=/usr/local/aideqc/llvm -DBUILD_SHARED_LIBS=TRUE -DLLVM_ENABLE_DUMP=TRUE -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_PROJECTS="clang;mlir" \

docker/ci/alpine/qcor/Dockerfile

+7 −6
Original line number Diff line number Diff line 
FROM qcor/llvm-alpine



RUN apk add libc6-compat && git clone https://github.com/ornl-qci/qcor && cd qcor && mkdir build && cd build \

   && cmake .. -G Ninja -DLLVM_ROOT=/usr/local/aideqc/llvm -DQCOR_EXTRA_COMPILER_FLAGS="-B /usr/lib/gcc/x86_64-alpine-linux-musl/10.3.1 -L /usr/lib/gcc/x86_64-alpine-linux-musl/10.3.1" -DQCOR_EXTRA_HEADERS="/usr/include/c++/10.3.1;/usr/include/c++/10.3.1/x86_64-alpine-linux-musl" \

FROM qcor/llvm-alpine as llvm_install

FROM xacc/alpine

COPY --from=llvm_install /usr/local/aideqc/llvm /usr/local/aideqc/llvm

RUN apk add libc6-compat ninja && git clone https://github.com/ornl-qci/qcor && cd qcor && mkdir build && cd build \

   && cmake .. -G Ninja -DXACC_DIR=/usr/local/aideqc/qcor -DCMAKE_INSTALL_PREFIX=/usr/local/aideqc/qcor -DLLVM_ROOT=/usr/local/aideqc/llvm -DQCOR_EXTRA_COMPILER_FLAGS="-B /usr/lib/gcc/x86_64-alpine-linux-musl/10.3.1 -L /usr/lib/gcc/x86_64-alpine-linux-musl/10.3.1" -DQCOR_EXTRA_HEADERS="/usr/include/c++/10.3.1;/usr/include/c++/10.3.1/x86_64-alpine-linux-musl" \

   && cmake --build . --target install && cd ../.. && rm -rf qcor 

ENV PYTHONPATH "${PYTHONPATH}:/root/.xacc/bin"

ENV PATH "${PATH}:/root/.xacc/bin"
 
ENV PYTHONPATH "${PYTHONPATH}:/usr/local/aideqc/qcor"

ENV PATH "${PATH}:/usr/local/aideqc/qcor/bin"

tools/driver/qcor.in

+5 −1
Original line number Diff line number Diff line
@@ -736,7 +736,11 @@ def main(argv=None): 
            exit(1)

    else:

        # This is a .o file, so execute the link phase

        commands = [compiler, '-Wno-unused-command-line-argument', '-Wno-override-module'] + baseLibs + sys.argv[1:]

        commands = [compiler]

        if len(extra_flags):

            commands += extra_flags

        commands += ['-Wno-unused-command-line-argument', '-Wno-override-module'] + baseLibs + sys.argv[1:]



        if verbose:

            info('{}'.format(' '.join([c for c in commands])))

        try: