Dev container now uses pre-built packages. Added mechanism to create these packages. Prepared cross-platform support.

Extensive changes have been made to the build environment. The dev-container now
downloads packages instead of building them every time a dev-container is
re-built. Seperate from that a mechanism has been created to consistenly build
these packages, even cross platform.
This commit is contained in:
Bart Beumer 2026-01-16 22:26:53 +00:00
parent 23d74e35a1
commit e960b29480
16 changed files with 233 additions and 40 deletions

View File

@ -1,22 +0,0 @@
FROM alpine:3.21.3
# Install tools required for building.
RUN apk update && \
apk add --no-cache \
autoconf \
bash \
build-base \
cmake \
clang \
clang-extra-tools \
gdb \
git \
libstdc++ \
libtool \
linux-headers \
m4 \
perl \
python3 \
py3-pip && \
pip install --break-system-packages conan && \
conan profile detect

View File

@ -1,14 +1,22 @@
{
"name": "C++",
"name": "4beumer.nl C++",
"build": {
"dockerfile": "Dockerfile"
"dockerfile": "../devcontainer.Dockerfile",
},
"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/postcreate.py --environment=${containerWorkspaceFolder}/dev-environment.json",
// Configure tool-specific properties.
"customizations": {
"vscode": {
"settings": {},
"settings": {
"conan-extension.installArgs": [
"-of build",
"-s build_type=Debug",
"-s compiler.cppstd=23"
],
},
"extensions": [
"ms-vscode.cpptools",
"ms-python.python",
"twxs.cmake",
"ms-vscode.cmake-tools",
"konicy.conan-extension"

36
.devcontainer/postcreate.py Executable file
View File

@ -0,0 +1,36 @@
#! /usr/bin/python
import argparse
import json
import os
import subprocess
import sys
def runcmd(command):
print('RUN ' + command)
process = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True)
for line in iter(process.stdout.readline, b''): # b'' indicates EOF
print(line.decode('utf-8'), end='')
def load_environment(filename):
with open(filename) as f:
return json.load(f)
parser = argparse.ArgumentParser()
parser.add_argument('--environment')
args = parser.parse_args()
environment = load_environment(args.environment)
env_build_type = environment["build_type"]
env_cppstd = environment["cppstd"]
env_conan_remote_fallback = environment["conan_remote_fallback"]
env_conan_remote_upload = environment["conan_remote_upload"]
runcmd('conan remote remove conancenter')
runcmd('conan remote add conan-upload ' + env_conan_remote_upload)
runcmd('conan remote add conan-remote ' + env_conan_remote_fallback)
runcmd('conan install . -of build -s compiler.cppstd=' + env_cppstd + ' -s build_type=' + env_build_type + ' --build=never')
sys.exit(0)

34
README.md Normal file
View File

@ -0,0 +1,34 @@
# Network experiment
This repository mostly contains personal experiments related to C++, CMake, conan, and some stuff that might end up on a raspberry pi. I have tried to rely mostly on development containers and almost no tools on the host. This should make it possible to build/develop/use this code on any machine that runs dev container, including ARM systems and Windows.
## How to use:
### Start developing
1. Clone the repository to a location of your liking.
2. Have an IDE that supports dev containers. I have used Visual studio code.
3. Open the project in your IDE, it should offer to open the project in a dev container.
Also take into consideration the following files:
1. ``dev-environment.json``
This file contains information about the type of build, the C++ version to use, and conan remotes used to retrieve packages.
2. ``.devcontainer/devcontainer.json``
Also contains configuration on plugins used (and some duplicated config on build type and C++ version).
### Building conan dependencies
Available in this repository is a ``dev-pre-conan-pkgs.Dockerfile`` that can be used to build all the conan dependencies and upload them to a remote.
1. Use dev-environment.json to configure the remotes (Where retrieve info, where to upload binaries).
2. Build the docker image using the following command:
``docker build -t tmp_bldconan -f dev-prep-conan-pkgs.Dockerfile .``
3. Run using the image to build & upload packages:
``docker run -ti tmp_bldconan``
- While running a username and password will be required to login.
- Do not forget to remove the image if you do not need it anymore.
Building conan packages for other architectures is also possible using "buildx". See external documentation on how to setup this feature. When setup, the following commands can be used to build for both 32 and 64 bit ARM (useful for raspberry pi).
- ``docker buildx build -t tmp_bldconan_arm64 -f dev-prep-conan-pkgs.Dockerfile . --load --platform=linux/arm64``
- ``docker buildx build -t tmp_bldconan_arm32 -f dev-prep-conan-pkgs.Dockerfile . --load --platform=linux/arm``
- ``docker run -ti --platform=linux/arm64 tmp_bldconan_arm64 ``
- ``docker run -ti --platform linux/arm tmp_bldconan_arm32``

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.20)
find_package(Boost 1.84.0 REQUIRED COMPONENTS program_options headers CONFIG)
find_package(Boost 1.90.0 REQUIRED COMPONENTS program_options headers CONFIG)
find_package(JPEG REQUIRED)
project(text2image)
@ -11,7 +11,7 @@ add_executable(
set_property(
TARGET ${PROJECT_NAME}
PROPERTY CXX_STANDARD 20
PROPERTY CXX_STANDARD 23
)
target_link_libraries(

View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.20)
find_package(freetype REQUIRED)
find_package(Boost 1.84.0 REQUIRED COMPONENTS headers CONFIG)
find_package(Boost 1.90.0 REQUIRED COMPONENTS headers CONFIG)
project(bmrshared-freetype)
@ -14,7 +14,7 @@ add_library(
set_property(
TARGET ${PROJECT_NAME}
PROPERTY CXX_STANDARD 20
PROPERTY CXX_STANDARD 23
)
target_include_directories(

View File

@ -11,7 +11,7 @@ add_library(
set_property(
TARGET ${PROJECT_NAME}
PROPERTY CXX_STANDARD 20
PROPERTY CXX_STANDARD 23
)
target_include_directories(
@ -26,6 +26,6 @@ target_link_libraries(
)
install(
FILES ${CONAN_LIBMAGIC_PACKAGE_FOLDER}/res/magic.mgc
FILES ${BLDENV_LIBMAGIC_PACKAGE_FOLDER}/res/magic.mgc
DESTINATION bin
)

View File

@ -13,7 +13,7 @@ add_executable(
set_property(
TARGET ${PROJECT_NAME}
PROPERTY CXX_STANDARD 20
PROPERTY CXX_STANDARD 23
)
target_link_libraries(

View File

@ -11,7 +11,7 @@ add_library(
set_property(
TARGET ${PROJECT_NAME}
PROPERTY CXX_STANDARD 20
PROPERTY CXX_STANDARD 23
)
target_include_directories(

View File

@ -15,7 +15,7 @@ add_executable(
set_property(
TARGET ${PROJECT_NAME}
PROPERTY CXX_STANDARD 20
PROPERTY CXX_STANDARD 23
)
target_link_libraries(

View File

@ -3,18 +3,30 @@ from conan import ConanFile
from conan.tools.files import copy
from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps
class HelloConan(ConanFile):
class BmrConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
requires = "boost/1.84.0", "gtest/1.14.0", "libmagic/5.45", "freetype/2.13.3", "libjpeg/9f"
generators = "CMakeDeps"
build_policy = "*"
build_policy = "never"
def configure(self):
self.options["boost"].without_cobalt = True
if self.settings.arch == "armv7":
self.options["libpng"].neon = False
def requirements(self):
self.requires("boost/1.90.0")
self.requires("gtest/1.16.0")
self.requires("libmagic/5.45")
self.requires("freetype/2.14.1")
self.requires("libjpeg/9f")
self.requires("libpng/1.6.54")
def generate(self):
# We need to find the folder of libmagic and supply it to cmake so that
# we can deploy the magic file.
libmagic = self.dependencies["libmagic"]
tc = CMakeToolchain(self)
tc.variables["CONAN_LIBMAGIC_PACKAGE_FOLDER"] = libmagic.package_folder
tc.variables["BLDENV_LIBMAGIC_PACKAGE_FOLDER"] = libmagic.package_folder
tc.generate()

6
dev-environment.json Normal file
View File

@ -0,0 +1,6 @@
{
"build_type": "Debug",
"cppstd" : "23",
"conan_remote_fallback" : "https://artifacts.4beumer.nl/repository/conan-center-proxy/",
"conan_remote_upload" : "https://artifacts.4beumer.nl/repository/conan-bmrdev/"
}

View File

@ -0,0 +1,43 @@
FROM alpine:3.22.2
# Install packages needed in both building and running.
RUN apk update && \
apk add --no-cache \
libstdc++
# Install tools required for building.
RUN mkdir -p /root/.local/bin
ENV PATH="${PATH}:/root/.local/bin"
RUN apk add --no-cache \
autoconf \
bash \
binutils \
build-base \
cmake \
clang \
clang-extra-tools \
gdb \
git \
libtool \
linux-headers \
ninja \
m4 \
perl \
python3 \
pipx
RUN pipx ensurepath \
&& pipx install conan \
&& conan profile detect
RUN mkdir -p /tmpdev
WORKDIR /tmpdev
ADD conanfile.py .
ADD dev-environment.json .
ADD --chmod=544 ./scripts/dev-prep-conan-pkgs/dev-prep-conan-pkgs.py .
ADD --chmod=544 ./scripts/dev-prep-conan-pkgs/entrypoint.sh .
ENTRYPOINT ["./entrypoint.sh"]

32
devcontainer.Dockerfile Normal file
View File

@ -0,0 +1,32 @@
FROM alpine:3.22.2
# Install packages needed in both building and running.
RUN apk update && \
apk add --no-cache \
libstdc++
# Install tools required for building.
RUN mkdir -p /root/.local/bin
ENV PATH="${PATH}:/root/.local/bin"
RUN apk add --no-cache \
autoconf \
bash \
binutils \
build-base \
cmake \
clang \
clang-extra-tools \
gdb \
git \
libtool \
linux-headers \
ninja \
m4 \
perl \
python3 \
pipx
RUN pipx ensurepath \
&& pipx install conan \
&& conan profile detect

View File

@ -0,0 +1,39 @@
#! /usr/bin/python
import argparse
import json
import os
import subprocess
import sys
def runcmd(command):
print('RUN ' + command)
process = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True)
for line in iter(process.stdout.readline, b''): # b'' indicates EOF
print(line.decode('utf-8'), end='')
def load_environment(filename):
with open(filename) as f:
return json.load(f)
parser = argparse.ArgumentParser()
parser.add_argument('--environment')
args = parser.parse_args()
environment = load_environment(args.environment)
env_build_type = environment["build_type"]
env_cppstd = environment["cppstd"]
env_conan_remote_fallback = environment["conan_remote_fallback"]
env_conan_remote_upload = environment["conan_remote_upload"]
with open('CMakeLists.txt', 'w') as fp:
pass
runcmd('conan remote remove conancenter')
runcmd('conan remote add conan-upload ' + env_conan_remote_upload)
runcmd('conan remote add conan-remote ' + env_conan_remote_fallback)
runcmd('conan install . -of build -s compiler.cppstd=' + env_cppstd + ' -s build_type=' + env_build_type + ' --build=*')
sys.exit(0)

View File

@ -0,0 +1,5 @@
#!/bin/bash
./dev-prep-conan-pkgs.py --environment=dev-environment.json
conan upload -r conan-upload "*/*" --check -c