Skip to content

Commit dda8c04

Browse files
committed
cleanup and no-sudo
1 parent 3d0a34a commit dda8c04

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.jenkins/clean.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
sudo docker system prune --all --volumes --force
3+
docker system prune --all --volumes --force

.jenkins/deploy.sh

100644100755
+5-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
## Save the docker
44
echo -e "> Saving the FreeFEM image"
5-
sudo docker save -o freefem.tar freefem
5+
docker save -o freefem.tar freefem
66

77
## Compress the image
88
echo -e "> Compressing the archive"
9-
sudo gzip freefem.tar
10-
sudo chown ci freefem.tar.gz
9+
gzip freefem.tar
10+
chown ci freefem.tar.gz
1111

1212
## Deploy to GitHub releases
1313
echo -e "> Deploy to GitHub releases"
@@ -19,12 +19,13 @@ FILE_NAME='freefem.tar.gz'
1919
# Get the current release number from sources
2020
SOURCE_REPOSITORY='FreeFem-sources'
2121
CURRENT_VERSION=$(curl "https://api.github.com/repos/$ORGANIZATION/$SOURCE_REPOSITORY/releases/latest" | jq -r '.tag_name')
22-
2322
echo "Current FreeFEM version: $CURRENT_VERSION"
2423

2524
# Create the release (keep the upload url)
2625
RELEASE_PARAMETERS=$(printf '{"tag_name": "%s", "target_commitish": "master", "name": "%s", "body": "FreeFEM docker - FreeFEM %s.", "draft": false, "prerelease": false}' "$CURRENT_VERSION" "$CURRENT_VERSION" "$CURRENT_VERSION")
2726
RELEASE=$(curl -H "Authorization: token $TOKEN" --data "$RELEASE_PARAMETERS" "https://api.github.com/repos/$ORGANIZATION/$REPOSITORY/releases")
27+
echo "RELEASE: " "$RELEASE"
28+
2829
UPLOAD_URL=$(echo "$RELEASE" | jq -r '.upload_url')
2930
echo "Upload URL: $UPLOAD_URL"
3031

.jenkins/deployDockerHub.sh

100644100755
File mode changed.

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN cd $DIRPATH/3rdparty/ff-petsc \
4343
&& make petsc-slepc
4444

4545
# Reconfigure and compile FreeFEM
46-
RUN ./reconfigure && make -j 1
46+
RUN ./reconfigure && make -j"$(nproc)"
4747

4848
# Install FreeFEM
4949
RUN make install

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
## Build the docker for FreeFEM compilation
44
echo -e "> Building FreeFEM Docker image"
5-
sudo docker build --network=host --tag freefem . --no-cache
5+
docker build --network=host --tag freefem . --no-cache

0 commit comments

Comments
 (0)