Verified Commit 91b5aca1 authored by Ramon Nou's avatar Ramon Nou Committed by Marc Vef
Browse files

Solved SegFault on date, update fmt, rocksdb 0.9.3

parent 1fe75834

.gitlab-ci.yml

+10 −10
Original line number Diff line number Diff line
@@ -24,14 +24,14 @@ variables: 
  GIT_SUBMODULE_STRATEGY:       recursive



# base image

image: gekkofs/core:0.9.2

image: gekkofs/core:0.9.3



################################################################################

## Validating

################################################################################

check format:

  stage: lint

  image: gekkofs/linter:0.9.2

  image: gekkofs/linter:0.9.3

  needs: []

  script:

    - ${SCRIPTS_DIR}/check_format.sh
@@ -45,7 +45,7 @@ check format: 
################################################################################

gkfs:

  stage: build

  image: gekkofs/deps:0.9.2

  image: gekkofs/deps:0.9.3

  interruptible: true

  needs: []

  script:
@@ -72,7 +72,7 @@ gkfs: 
## == tests for scripts ====================

scripts:

  stage: test

  image: gekkofs/testing:0.9.2

  image: gekkofs/testing:0.9.3

  needs: []

  script:

    - mkdir -p ${BUILD_PATH}/tests/scripts
@@ -88,7 +88,7 @@ scripts: 
## == integration tests for gkfs ===========

gkfs:integration:

  stage: test

  image: gekkofs/testing:0.9.2

  image: gekkofs/testing:0.9.3

  interruptible: true

  needs: ['gkfs']

  parallel:
@@ -137,7 +137,7 @@ gkfs:integration: 
## == integration tests for gkfwd ==========

gkfwd:integration:

  stage: test

  image: gekkofs/testing:0.9.2

  image: gekkofs/testing:0.9.3

  interruptible: true

  needs: ['gkfs']

  parallel:
@@ -187,7 +187,7 @@ gkfwd:integration: 
## == unit tests for gkfs ==================

gkfs:unit:

  stage: test

  image: gekkofs/testing:0.9.2

  image: gekkofs/testing:0.9.3

  needs: ['gkfs']

  script:

    ## Add path to mkfs.kreon
@@ -225,7 +225,7 @@ gkfs:unit: 
################################################################################

documentation:

  stage: docs

  image: gekkofs/docs:0.9.2

  image: gekkofs/docs:0.9.3

  needs: []

  rules:

    # we only build the documentation automatically if we are on the
@@ -255,7 +255,7 @@ documentation: 
## == coverage baseline ====================

coverage:baseline:

  stage: report

  image: gekkofs/testing:0.9.2

  image: gekkofs/testing:0.9.3

  interruptible: true

  needs: ['gkfs']
@@ -281,7 +281,7 @@ coverage:baseline: 


coverage:

  stage: report

  image: gekkofs/testing:0.9.2

  image: gekkofs/testing:0.9.3

#  needs: [ 'coverage:baseline', 'gkfs:integration', 'gkfwd:integration',

#           'gkfs:unit' ]

  needs: [ 'coverage:baseline', 'gkfs:integration', 'gkfs:unit', 'gkfwd:integration']

CMake/FindDate.cmake

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ find_path(TZ_INCLUDE_DIR 
)



find_library(TZ_LIBRARY

    NAMES tz

    NAMES date-tz

)



include(FindPackageHandleStandardArgs)

docker/0.9.3/core/Dockerfile

0 → 100644
+40 −0
Original line number Diff line number Diff line 
FROM debian:bullseye-slim



LABEL Description="Debian-based environment suitable to build GekkoFS and its dependencies"



RUN apt-get update && \

    apt-get install -y --no-install-recommends \

		git \

		curl \

		ca-certificates \

		libtool \

		pkg-config \

		make \

		automake \

		gcc \

		g++ \

		ninja-build \

		procps \

		# AGIOS dependencies

		libconfig-dev \

		# Mercury dependencies

		libltdl-dev \

		lbzip2 \

        # Margo dependencies \

        libjson-c-dev \

		# RocksDB dependencies

		liblz4-dev \

		# syscall_intercept dependencies

		libcapstone-dev \

		# GekkoFS dependencies

		libboost-program-options-dev \

		uuid-dev && \

    # install cmake 3.14+ since it's needed for some dependencies

    curl -OL https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-Linux-x86_64.sh && \

    chmod u+x ./cmake-3.25.2-Linux-x86_64.sh && \

    ./cmake-3.25.2-Linux-x86_64.sh --skip-license --prefix=/usr && \

    # Clean apt cache to reduce image layer size

    rm -rf /var/lib/apt/lists/* && \

    # Clean apt caches of packages

    apt-get clean && apt-get autoclean && \

    rm ./cmake-3.25.2-Linux-x86_64.sh

docker/0.9.3/core/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
.PHONY: all



amd64:

	docker buildx build --platform amd64 -t gekkofs/core:0.9.3 .



aarch64:

	docker buildx build --platform aarch64 -t gekkofs/core:0.9.3 .



all:

	docker buildx build -t gekkofs/core:0.9.3 .

docker/0.9.3/deps/Dockerfile

0 → 100644
+38 −0
Original line number Diff line number Diff line 
FROM gekkofs/core:0.9.3



LABEL Description="Debian-based environment to build GekkoFS"



ENV GKFS_PATH	/opt/gkfs

ENV GKFS_VERSION 0.9.3



ENV SCRIPTS_PATH	${GKFS_PATH}/scripts

ENV DEPS_SRC_PATH	${GKFS_PATH}/deps_src

ENV INSTALL_PATH	/usr/local



COPY scripts/dl_dep.sh		${SCRIPTS_PATH}/

COPY scripts/compile_dep.sh ${SCRIPTS_PATH}/

COPY scripts/patches        ${SCRIPTS_PATH}/patches

COPY scripts/profiles       ${SCRIPTS_PATH}/profiles



RUN apt-get update && \

    apt-get install -y --no-install-recommends \

		python3 \

		python3-pip \

		python3-dev \

		python3-venv \

		python3-setuptools \

    libnuma-dev libyaml-dev libcurl4-openssl-dev \

    procps && \

    python3 -m pip install --upgrade pip && \

    rm -rf /var/lib/apt/lists/* && \

    apt-get clean && apt-get autoclean

 

# Download and build dependencies

RUN cd ${SCRIPTS_PATH} && \

    /bin/bash ./dl_dep.sh -p ci:${GKFS_VERSION} ${DEPS_SRC_PATH} && \

    /bin/bash ./compile_dep.sh -j 8 -p ci:${GKFS_VERSION} ${DEPS_SRC_PATH} ${INSTALL_PATH} && \

    cp ${DEPS_SRC_PATH}/parallax/lib/include/parallax/structures.h ${INSTALL_PATH}/include/ &&\

    rm -rf ${DEPS_SRC_PATH} && \

    rm -rf ${SCRIPTS_PATH} && \

    rmdir ${GKFS_PATH} && \

    ldconfig