From 06b48f776e8143993060495f4984c6d3bb586b58 Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Wed, 8 May 2024 18:32:53 -0700
Subject: [PATCH] .get a new build
---
.gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++
Dockerfile | 25 ++++++++++++++-----------
2 files changed, 48 insertions(+), 11 deletions(-)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..c9eadcf
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,34 @@
+image: docker:23.0.1
+
+variables:
+ # When using dind service, you must instruct docker to talk with the
+ # daemon started inside of the service. The daemon is available with
+ # a network connection instead of the default /var/run/docker.sock socket.
+ #
+ # The 'docker' hostname is the alias of the service container as described at
+ # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services
+ #
+ # If you're using GitLab Runner 12.7 or earlier with the Kubernetes executor and Kubernetes 1.6 or earlier,
+ # the variable must be set to tcp://localhost:2375 because of how the
+ # Kubernetes executor connects services to the job container
+ # DOCKER_HOST: tcp://localhost:2375
+ #
+ DOCKER_HOST: tcp://docker:2375
+ #
+ # This instructs Docker not to start over TLS.
+ DOCKER_TLS_CERTDIR: ""
+
+services:
+ - docker:23.0.1-dind
+
+before_script:
+ - docker info
+
+build:
+ stage: build
+ script:
+ - docker login -u recolic -p "$docker_pswd"
+ - docker build -t recolic/cxx-toolkit .
+ - docker push recolic/cxx-toolkit
+
+
diff --git a/Dockerfile b/Dockerfile
index f3fe522..adb6c47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,16 +4,19 @@ MAINTAINER root@recolic.net
RUN pacman -Syu --noconfirm gcc clang make cmake git lzop
-# Build this package with another machine, and install it into docker.
-# COPY ./makepkg /usr/bin/makepkg
-# RUN git clone https://aur.archlinux.org/intel-parallel-studio-xe.git && cd intel-parallel-studio-xe && makepkg -i
+#### Intel-C++ installer. Disabled.
+## # Build this package with another machine, and install it into docker.
+## # COPY ./makepkg /usr/bin/makepkg
+## # RUN git clone https://aur.archlinux.org/intel-parallel-studio-xe.git && cd intel-parallel-studio-xe && makepkg -i
+##
+## RUN sed -i 's/#RemoteFileSigLevel = Required/RemoteFileSigLevel = Optional/g' /etc/pacman.conf
+## RUN pacman -U --noconfirm https://cnm.cool/res/intel-common-libs-2019.3.199-3-x86_64.pkg.tar.lzo https://cnm.cool/res/intel-openmp-2019.3.199-3-x86_64.pkg.tar.lzo https://cnm.cool/res/intel-compiler-base-2019.3.199-3-x86_64.pkg.tar.lzo
+## COPY INTEL_LICENSE_UCB_S4ZD-3DZ7HJTN.lic /opt/intel/licenses/INTEL_LICENSE_UCB_S4ZD-3DZ7HJTN.lic
+##
+## ENV PATH="/opt/intel/bin/:${PATH}"
+## # RUN echo 'export PATH=$PATH:/opt/intel/bin/' >> /root/.bashrc
+##
+## RUN icpc --version; g++ --version; clang++ --version
-RUN sed -i 's/#RemoteFileSigLevel = Required/RemoteFileSigLevel = Optional/g' /etc/pacman.conf
-RUN pacman -U --noconfirm https://cnm.cool/res/intel-common-libs-2019.3.199-3-x86_64.pkg.tar.lzo https://cnm.cool/res/intel-openmp-2019.3.199-3-x86_64.pkg.tar.lzo https://cnm.cool/res/intel-compiler-base-2019.3.199-3-x86_64.pkg.tar.lzo
-COPY INTEL_LICENSE_UCB_S4ZD-3DZ7HJTN.lic /opt/intel/licenses/INTEL_LICENSE_UCB_S4ZD-3DZ7HJTN.lic
-
-ENV PATH="/opt/intel/bin/:${PATH}"
-# RUN echo 'export PATH=$PATH:/opt/intel/bin/' >> /root/.bashrc
-
-RUN icpc --version; g++ --version; clang++ --version
+RUN g++ --version; clang++ --version
--
GitLab