Skip to content

Commit

Permalink
fix action
Browse files Browse the repository at this point in the history
  • Loading branch information
rafal-gorecki committed Oct 4, 2023
1 parent 439e3f2 commit 6f1d90a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-docker-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v3

- name: "Set VERSION env"
run: echo "VERSION=$(docker run --rm --entrypoint /bin/bash husarion/${{ env.IMAGE_NAME }}:${{ inputs.ros_distro }}-nightly -c "cat /version.txt")" >> $GITHUB_ENV
run: echo "VERSION=$(curl -s https://raw.githubusercontent.com/foxglove/studio/main/package.json | jq -r '.version' | sed -nE 's/.*\b([0-9]+\.[0-9]+\.[0-9]+)\b.*/\1/p')" >> $GITHUB_ENV
shell: bash

- name: Set SHORT_DATE env
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,5 @@ ENV UI_PORT=8080
# replace file:///ros2_ws with http://{{.Host}}:UI_PORT/ros2_ws in /src/rosbot_xl.urdf and /src/rosbot.urdf files
RUN sed -i 's|file:///ros2_ws|http://{{.Host}}:{{env "UI_PORT"}}/ros2_ws|g' /src/rosbot_xl.urdf /src/rosbot.urdf /src/panther.urdf

RUN echo $(curl -s https://raw.githubusercontent.com/foxglove/studio/main/package.json | jq -r '.version' | sed -nE 's/.*\b([0-9]+\.[0-9]+\.[0-9]+)\b.*/\1/p') > /version.txt

ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
5 changes: 1 addition & 4 deletions demo/compose.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
services:
foxglove:
# image: husarion/foxglove:v1.72.0
build:
context: ..
dockerfile: Dockerfile
image: husarion/foxglove:1.72.0
ports:
- 8080:8080
volumes:
Expand Down

0 comments on commit 6f1d90a

Please sign in to comment.