Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit e15d384

Browse files
authored
Merge pull request #52 from GBuella/docker_fix_almost_there
Fix a typo in travis yml
2 parents 0542c9a + b0455ed commit e15d384

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ script:
2525
- ./build.sh
2626

2727
after_success:
28-
- if [[ $PUSH_THE_IMAGE -eq 1 ]]; then images/push-image.sh $OS:$OS_VER; fi
28+
- if [[ $PUSH_THE_IMAGE -eq 1 ]]; then images/push-image.sh $OS-$OS_VER; fi

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Userspace syscall intercepting library.
2121
* perl -- for checking coding style
2222
* pandoc -- for generating the man page
2323

24-
# Travis CI build dependencies #
24+
### Travis CI build dependencies ###
2525

2626
The travis builds use some scripts to generate a docker images, in which syscall_intercept is built/tested.
2727
These docker images are pushed to Dockerhub, to be reused in later travis builds.
@@ -33,7 +33,7 @@ The scripts expect four environment variables to be set in the travis environmen
3333
* DOCKERHUB_PASSWORD - used for logging into Dockerhub
3434
* GITHUB_REPO - where the repository is available on github (e.g. "pmem/syscall_intercept" )
3535

36-
# How to build #
36+
### How to build ###
3737

3838
Building libsyscall_intercept requires cmake.
3939
Example:

utils/docker/images/Dockerfile.ubuntu-16.04

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,11 @@ RUN apt-get install -y \
6565
wget \
6666
whois
6767

68-
6968
# Add user
7069
ENV USER user
7170
ENV USERPASS pass
7271
RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS`
7372

74-
7573
# Install nvml
7674
COPY install-nvml.sh install-nvml.sh
7775
RUN ./install-nvml.sh dpkg

utils/docker/images/build-pmemfile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ cd
7070
# antool tests.
7171
git clone https://github.com/pmem/pmemfile.git
7272
cd pmemfile
73-
git checkout a7f1d347bfdbabec3b0e0b1dca50542ec6c267e3
73+
git checkout 6d1e91ecdf86263b9ddf0224963b37715f33874d
7474
mkdir build
7575
cd build
7676
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \

0 commit comments

Comments
 (0)