Skip to content

B
Babeld
Commit 351aa595 authored by nanahira's avatar nanahira
Browse files
Options

fix dockerfile

parent 23a579ca
Pipeline #3373 failed with stages
        in 39 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 3 additions and 8 deletions
        .gitlab-ci.yml
        View file @ 351aa595
        ...@@ -18,7 +18,7 @@ build-x86: ...@@ -18,7 +18,7 @@ build-x86:
        tags: tags:
        - docker - docker
        script: script:
        - docker build --pull --build-arg TARGETARCH=amd64 -t $CONTAINER_TEST_X86_IMAGE . - docker build --pull -t $CONTAINER_TEST_X86_IMAGE .
        - docker push $CONTAINER_TEST_X86_IMAGE - docker push $CONTAINER_TEST_X86_IMAGE
        build-arm: build-arm:
        ...@@ -26,7 +26,7 @@ build-arm: ...@@ -26,7 +26,7 @@ build-arm:
        tags: tags:
        - docker-arm - docker-arm
        script: script:
        - docker build --pull --build-arg TARGETARCH=arm64 -t $CONTAINER_TEST_ARM_IMAGE . - docker build --pull -f Dockerfile.arm -t $CONTAINER_TEST_ARM_IMAGE .
        - docker push $CONTAINER_TEST_ARM_IMAGE - docker push $CONTAINER_TEST_ARM_IMAGE
        combine: combine:
        ......
        Dockerfile
        View file @ 351aa595
        FROM archlinux as target-amd64 FROM archlinux
        RUN echo 'Server = https://mirrors.aliyun.com/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist RUN echo 'Server = https://mirrors.aliyun.com/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
        FROM lopsided/archlinux as target-arm64
        RUN echo 'Server = https://mirrors.aliyun.com/archlinuxarm/$arch/$repo/' > /etc/pacman.d/mirrorlist
        FROM target-${TARGETARCH}
        RUN pacman -Syu --noconfirm babeld RUN pacman -Syu --noconfirm babeld
        CMD ["babeld"] CMD ["babeld"]
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment