Skip to content

Commit aef5e54

Browse files
Integrate upstream changes and resolve Docker configuration conflicts (#263)
* Merge build and deploy to fix deploy problems * Add nest-server requirements * Fix nest-desktop and compose file * Add v3.7 * Remove test * Add v3.7 to readme * Fix nestml version and add pygsl * Install nestml fix for nest verssion * Fix merging errors * Deactivate build of 3.7 and 2.20.2 in CI * Add rc2 * NEW Version 3.8 * Fix the mermaid installation with a patch and fix some doubles * Fix numpy installation * Add NESTML v8.0.0rc3 * feat: add devcontainer and Dependabot configuration Add a devcontainer configuration for an Ubuntu environment with Docker support. Include features for Docker-in-Docker, Docker Buildx, and Docker Compose. Introduce a Dependabot configuration to automate dependency updates for devcontainers on a weekly basis. These changes enhance development efficiency and ensure up-to-date dependencies. * fix: update nestml to version 8.0.0 in Dockerfiles Update the nestml package version from 8.0.0-rc3 to 8.0.0 in bothDockerfiles. change ensures that the latest stable version of nestml is used, improving compatibility and stability of the environment. * Delete devcontainer file * Remove double of pip install numpy in Dockerfile * Comment out Docker registry login in CI configuration * fix: update destination repository URLs in ebrains-push workflow
1 parent c599f02 commit aef5e54

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/ebrains-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
with:
1717
source_repo: "nest/nest-docker"
1818
source_branch: "master"
19-
destination_repo: "https://ghpusher:${{ secrets.EBRAINS_PUSH_TOKEN }}@gitlab.ebrains.eu/nest/nest-docker"
19+
destination_repo: "https://ghpusher:${{ secrets.EBRAINS_PUSH_TOKEN }}@gitlab.ebrains.eu/nest/nest-docker.git"
2020
destination_branch: "master"
2121
- name: synctags
2222
uses: wei/git-sync@v3
2323
with:
2424
source_repo: "nest/nest-docker/"
2525
source_branch: "refs/tags/*"
26-
destination_repo: "https://ghpusher:${{ secrets.EBRAINS_PUSH_TOKEN }}@gitlab.ebrains.eu/nest/nest-docker"
26+
destination_repo: "https://ghpusher:${{ secrets.EBRAINS_PUSH_TOKEN }}@gitlab.ebrains.eu/nest/nest-docker.git"
2727
destination_branch: "refs/tags/*"

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ stages:
1010
- deploy
1111

1212
before_script:
13-
- echo -n $DOCKER_REGISTRY_TOKEN | docker login -u $DOCKER_REGISTRY_USER --password-stdin $DOCKER_REGISTRY
13+
#- echo -n $DOCKER_REGISTRY_TOKEN | docker login -u $DOCKER_REGISTRY_USER --password-stdin $DOCKER_REGISTRY
1414
- echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin
1515

1616
include: 'ci-templates/*.yml'

0 commit comments

Comments
 (0)