Skip to content

Commit

Permalink
Final touchups
Browse files Browse the repository at this point in the history
  • Loading branch information
Dominic Reber committed Jan 28, 2022
1 parent 6579efd commit 2f42929
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Step 2: If not already done, [create a remote toolchain in CLion](https://www.je
using the following credentials:
- Host: `127.0.0.1`
- Port: `2222` (or custom specified port)
- User name: `remote`
- User name: `developer`
- Authentication type: `Key pair`

Step 3: If not already done, [create a CMake profile that uses the remote toolchain](https://www.jetbrains.com/help/clion/remote-projects-support.html#CMakeProfile).
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 AS build-stage
FROM ubuntu:20.04 as build-stage
ARG PROTOBUF_VERSION=3.17.0
ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -25,7 +25,8 @@ RUN ./autogen.sh \
&& make \
&& make install
FROM ubuntu:20.04 AS google-dependencies
FROM ubuntu:20.04 as google-dependencies
COPY --from=build-stage /usr/local/include/google /usr/local/include/google
COPY --from=build-stage /usr/local/lib/libproto* /usr/local/lib/
COPY --from=build-stage /usr/local/bin/protoc /usr/local/bin
Expand Down
6 changes: 3 additions & 3 deletions source/dev-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Options:
-k, --key-file [path] Specify the path of the RSA
public key file.
(default: ${SSH_KEY_FILE})
-h, --help Show this help message"
-h, --help Show this help message."

while [ "$#" -gt 0 ]; do
case "$1" in
Expand Down Expand Up @@ -60,12 +60,12 @@ docker pull "${IMAGE_NAME}" || exit 1
docker container stop "${CONTAINER_NAME}" >/dev/null 2>&1
docker rm --force "${CONTAINER_NAME}" >/dev/null 2>&1

echo "Starting background container with access port ${SSH_PORT} for user ${USERNAME}"
echo "Starting background container with access port ${SSH_PORT} for user developer"
docker run -d --rm --cap-add sys_ptrace \
--user root \
--publish 127.0.0.1:"${SSH_PORT}":22 \
--name "${CONTAINER_NAME}" \
--hostname "${CONTAINER_NAME}" \
"${IMAGE_NAME}" /sshd_entrypoint.sh "${COMMAND_FLAGS[@]}"

echo "${CONTAINER_NAME}"
echo "${CONTAINER_NAME}"

0 comments on commit 2f42929

Please sign in to comment.